Merge branch 'battery' into release
authorLen Brown <len.brown@intel.com>
Sat, 6 Aug 2011 02:16:42 +0000 (22:16 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 6 Aug 2011 02:16:42 +0000 (22:16 -0400)
1  2 
drivers/acpi/battery.c

Simple merge