| commit | 71527bf8332ced9a961827272fe2f83fc5514f42 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Nov 02 19:36:26 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Nov 02 19:36:26 2007 -0700 |
| tree | ca20ec292a2d3111e2aa06fe01a5635e91a704b1 | |
| parent | 434a25d422db13729da14637325875dc64c05faf [diff] | |
| parent | acf603513ebc0ebf209f087fb7b9237b0c0a2581 [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] 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