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)
commit59b17bf6ea06abed519dfc788fff1b6b9499d23f
tree6f7e870659f91e753dc515cc1b8702420dd6a81e
parentedd84690d15e4cb144cc60b754d4eaf8fac0a711
parent0f66af530116e9f4dd97f328d91718b56a6fc5a4
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