Pull smart-battery into release branch

author Len Brown <len.brown@intel.com>

Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)

committer Len Brown <len.brown@intel.com>

Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)
author Len Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)
committer Len Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)
diff --cc drivers/acpi/ac.c
Simple merge
diff --cc drivers/acpi/battery.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)
committer	Len Brown <len.brown@intel.com>
	Sat, 1 Jul 2006 21:21:39 +0000 (17:21 -0400)
		1	2
drivers/acpi/ac.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/battery.c	patch \|	diff1 \|	diff2 \|	blob \| history