Merge branch 'sysfs' into release

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

Wed, 12 Nov 2008 02:14:49 +0000 (21:14 -0500)

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

Wed, 12 Nov 2008 02:14:49 +0000 (21:14 -0500)
author Len Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:49 +0000 (21:14 -0500)
committer Len Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:49 +0000 (21:14 -0500)
diff --cc drivers/acpi/ac.c
Simple merge
diff --cc drivers/acpi/battery.c
Simple merge
diff --cc drivers/acpi/processor_core.c
Simple merge
diff --cc drivers/acpi/thermal.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 12 Nov 2008 02:14:49 +0000 (21:14 -0500)
committer	Len Brown <len.brown@intel.com>
	Wed, 12 Nov 2008 02:14:49 +0000 (21:14 -0500)
		1	2
drivers/acpi/ac.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/battery.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/thermal.c	patch \|	diff1 \|	diff2 \|	blob \| history