| commit | cf9c1b92ae62ce71a8e861f02476724348defc6a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 23 10:41:17 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 23 10:41:17 2009 -0700 |
| tree | 433d77497f909eea2c35b7afff24de9f86212221 | |
| parent | 135aae340d66c5e273af297bbd5178a5e5c458ee [diff] | |
| parent | 9b901ee0cb007eb4e2ee056e5b1c5c2837d53bdb [diff] |
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] 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