| commit | 9e3e4b1d2d13bead8d52703c82a02b55f108b491 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 18 13:14:10 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 18 13:14:10 2009 -0700 |
| tree | 69d725323a2da43a571eb218beb7c55fa39f1ff2 | |
| parent | dcce284a259373f9e5570f2e33f79eca84fcf565 [diff] | |
| parent | 47bece87b14b866872b52ff04d469832e4936756 [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] hpwdt: Add NMI sourcing [WATCHDOG] iTCO_wdt: Fix ICH7+ reboot issue. [WATCHDOG] iTCO_wdt: fix memory corruption when RCBA is disabled by hardware [WATCHDOG] Correct WDIOF_MAGICCLOSE flag [WATCHDOG] move platform probe and remove function to devinit and devexit [WATCHDOG] Some more general cleanup [WATCHDOG] iTCO_wdt: Cleanup code