]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'async-battery' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:48:46 +0000 (01:48 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:48:46 +0000 (01:48 -0400)
commitc3eef708ac2f0d5e13ad078ea580df0b923bfb9c
tree6f7e870659f91e753dc515cc1b8702420dd6a81e
parent3142fb3b579ba92e0d77ebdc0f48389bc3ecf4cc
parent047ece007fdec84b90f01ff1c52510e1a2f8b380
Merge branch 'async-battery' into release

Conflicts:
drivers/acpi/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/Makefile
drivers/acpi/battery.c