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)
commit5389102e231d5f06da8b2897336293db18af9d76
tree39f7a1afe053ef8457f568cf4e1f9e960d1e6916
parentde96355c111679dd6e2c5c73e25e814c72510c58
parent69d94ec6d83d84044252d9ba03f6a8970816e350
Merge branch 'battery' into release
drivers/acpi/battery.c