Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm...

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

Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)

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

Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)
author Len Brown <len.brown@intel.com>
Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)
committer Len Brown <len.brown@intel.com>
Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)
diff --cc drivers/acpi/battery.c
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)
committer	Len Brown <len.brown@intel.com>
	Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)
		1	2	3	4	5	6	7	8
drivers/acpi/battery.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history
drivers/acpi/osl.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	blob \| history