Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 24 Feb 2011 19:00:44 +0000 (20:00 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 24 Feb 2011 19:00:44 +0000 (20:00 +0100)
commitdd87cc53c42f3260b7eb7f60822de0fa9e58af59
tree50d01d78e293c320d636fdca7361e6ef8514d9c7
parent981858bd7a401aa9607d9f430d5de920025fc3ea
parentbb45e394e21eb2abc710ad43d98ebac1069bf355
parentaad83b143008e1d406248803550bfbfc600b6398
parent23fe36306ea489eef7dd88506bdcefdc8da39c91
Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next
drivers/acpi/osl.c