Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Sep 2010 19:55:16 +0000 (12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Sep 2010 19:55:16 +0000 (12:55 -0700)
commit7fd3fce3a0a103bd6367889023c930ce3292d56a
tree554fa2cf3c0f04b77f0f06082328192b0b09fbaa
parent8be7eb359d96a6503de18b1a73fd6a24d8c983c9
parent0a18e15598274b79ce14342ce0bfb76a87dadb45
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: Enable NXP LPC32XX support in Kconfig (resend)
  watchdog: ts72xx_wdt: disable watchdog at probe
  watchdog: sb_wdog: release irq and reboot notifier in error path and module_exit()