tree 554fa2cf3c0f04b77f0f06082328192b0b09fbaa
parent 8be7eb359d96a6503de18b1a73fd6a24d8c983c9
parent 0a18e15598274b79ce14342ce0bfb76a87dadb45
author Linus Torvalds <torvalds@linux-foundation.org> 1284666916 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1284666916 -0700

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: 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()