* 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