]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2009 17:41:17 +0000 (10:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2009 17:41:17 +0000 (10:41 -0700)
commitcf9c1b92ae62ce71a8e861f02476724348defc6a
tree433d77497f909eea2c35b7afff24de9f86212221
parent135aae340d66c5e273af297bbd5178a5e5c458ee
parent9b901ee0cb007eb4e2ee056e5b1c5c2837d53bdb
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] wdt_pci.c: remove #ifdef CONFIG_WDT_501_PCI
  [WATCHDOG] hpwdt: Add NMI priority option
  [WATCHDOG] OMAP fixes: enable clock in probe, trigger timer reload
  [WATCHDOG] add bcm47xx watchdog driver
  [WATCHDOG] Freescale STMP: watchdog driver
  [WATCHDOG] twl4030 watchdog driver
  [WATCHDOG] U300 COH 901 327 watchdog driver
  [WATCHDOG] Add pnx833x_wdt