Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm...
Len Brown [Tue, 2 Aug 2011 21:22:09 +0000 (17:22 -0400)]
Conflicts:
Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <len.brown@intel.com>

1  2  3  4  5  6  7  8 
drivers/acpi/battery.c
drivers/acpi/osl.c

Simple merge
Simple merge