diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-03 11:59:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-03 11:59:13 -0800 |
| commit | ad6b646fe55c40ec193240b974561f0a3775d68d (patch) | |
| tree | d285d0396e9f7b9496976c6845910c04472e159c /block/Makefile | |
| parent | 61420f59a589c0668f70cbe725785837c78ece90 (diff) | |
| parent | 006948bafece27265dce72d3158b12af3ff67fce (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] Add support for the WM8350 watchdog
[WATCHDOG] Add SMSC SCH311x Watchdog Timer.
[WATCHDOG] ib700wdt - add timeout parameter
Diffstat (limited to 'block/Makefile')
0 files changed, 0 insertions, 0 deletions