Pull smart-battery into release branch
authorLen Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)
1  2 
drivers/acpi/ac.c
drivers/acpi/battery.c

Simple merge
Simple merge