diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 03:36:26 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 03:36:26 +0100 |
commit | 71527bf8332ced9a961827272fe2f83fc5514f42 (patch) | |
tree | ca20ec292a2d3111e2aa06fe01a5635e91a704b1 /drivers/watchdog/mtx-1_wdt.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
parent | [WATCHDOG] iTCO_wdt.c ICH8 pci-device-id's (diff) | |
download | linux-71527bf8332ced9a961827272fe2f83fc5514f42.tar.xz linux-71527bf8332ced9a961827272fe2f83fc5514f42.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] iTCO_wdt.c ICH8 pci-device-id's
[WATCHDOG] iTCO_wdt.c init & exit fixes
[WATCHDOG] iTCO_wdt.c pci_device_id table clean-up
[WATCHDOG] spin_lock_init() fixes
[WATCHDOG] Unlock in iTCO_wdt_start when reboot is disabled
[WATCHDOG] Add necessary braces to if (...) \n #if... cases
[WATCHDOG] trivial fix two returns in void functions
Diffstat (limited to 'drivers/watchdog/mtx-1_wdt.c')
0 files changed, 0 insertions, 0 deletions