diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 13:41:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 13:41:17 -0400 |
| commit | cf9c1b92ae62ce71a8e861f02476724348defc6a (patch) | |
| tree | 433d77497f909eea2c35b7afff24de9f86212221 /Makefile | |
| 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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions