diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 12:55:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 12:55:16 -0700 |
| commit | 7fd3fce3a0a103bd6367889023c930ce3292d56a (patch) | |
| tree | 554fa2cf3c0f04b77f0f06082328192b0b09fbaa /drivers/power/intel_mid_battery.c | |
| parent | 8be7eb359d96a6503de18b1a73fd6a24d8c983c9 (diff) | |
| parent | 0a18e15598274b79ce14342ce0bfb76a87dadb45 (diff) | |
| download | op-kernel-dev-7fd3fce3a0a103bd6367889023c930ce3292d56a.zip op-kernel-dev-7fd3fce3a0a103bd6367889023c930ce3292d56a.tar.gz | |
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/power/intel_mid_battery.c')
0 files changed, 0 insertions, 0 deletions
