From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Sep 2010 19:55:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: v2.6.36-rc5~27
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7fd3fce3a0a103bd6367889023c930ce3292d56a;p=~shefty%2Frdma-dev.git

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

7fd3fce3a0a103bd6367889023c930ce3292d56a