diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:55:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:55:16 +0200 |
commit | 7fd3fce3a0a103bd6367889023c930ce3292d56a (patch) | |
tree | 554fa2cf3c0f04b77f0f06082328192b0b09fbaa /drivers/macintosh/therm_windtunnel.c | |
parent | Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetca... (diff) | |
parent | watchdog: Enable NXP LPC32XX support in Kconfig (resend) (diff) | |
download | linux-7fd3fce3a0a103bd6367889023c930ce3292d56a.tar.xz linux-7fd3fce3a0a103bd6367889023c930ce3292d56a.zip |
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()
Diffstat (limited to 'drivers/macintosh/therm_windtunnel.c')
0 files changed, 0 insertions, 0 deletions