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)
Conflicts:
drivers/acpi/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>

Trivial merge