Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 00:09:29 +0000 (17:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 00:09:29 +0000 (17:09 -0700)
commit4b0e976c663e808822adf51274f948e8a4986f06
tree64ee15cbaafc283248dfac5dc7bccbc65b9159e0
parent19520fc1ee36164808e6f084bd95e8178e2db231
parent112e75466f63997d0f4c3c13ecf999e36aea692f
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: booke_wdt: clean up status messages
  watchdog: cleanup spaces before tabs
  watchdog: convert to DEFINE_PCI_DEVICE_TABLE
  watchdog: Xen watchdog driver
  watchdog: Intel SCU Watchdog Timer Driver for Moorestown and Medfield platforms.
  watchdog: jz4740_wdt - fix magic character checking
  watchdog: add JZ4740 watchdog driver
  watchdog: it87_wdt: Add support for IT8721F watchdog
  watchdog: hpwdt: build hpwdt as module by default with NMI_DECODING enabled
  watchdog: hpwdt: Fix a couple of typos
drivers/watchdog/Kconfig
drivers/watchdog/cpwd.c
drivers/watchdog/mpc8xxx_wdt.c