Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next
Rafael J. Wysocki [Thu, 24 Feb 2011 19:00:44 +0000 (20:00 +0100)]
1  2  3  4 
drivers/acpi/osl.c

Simple merge