diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 18:56:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 18:56:40 +0200 |
| commit | 14e71e4fb94c340273534a6d7f210aa82a3ca717 (patch) | |
| tree | 668c4ebb39e94755835364d2ba16615ae8c4ec82 /drivers/watchdog/sc1200wdt.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | [WATCHDOG] hpwdt - fix lower timeout limit (diff) | |
| download | linux-14e71e4fb94c340273534a6d7f210aa82a3ca717.tar.xz linux-14e71e4fb94c340273534a6d7f210aa82a3ca717.zip | |
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] hpwdt - fix lower timeout limit
[WATCHDOG] iTCO_wdt: TCO Watchdog patch for additional Intel Cougar Point DeviceIDs
[WATCHDOG] doc: Fix use of WDIOC_SETOPTIONS ioctl.
[WATCHDOG] doc: watchdog simple example: don't fail on fsync()
[WATCHDOG] set max63xx driver as ARM only
[WATCHDOG] powerpc: pika_wdt ident cannot be const
Diffstat (limited to 'drivers/watchdog/sc1200wdt.c')
0 files changed, 0 insertions, 0 deletions