summaryrefslogtreecommitdiff
path: root/drivers/acpi/osl.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-24 22:00:44 +0300
committerRafael J. Wysocki <rjw@sisk.pl>2011-02-24 22:00:44 +0300
commitdd87cc53c42f3260b7eb7f60822de0fa9e58af59 (patch)
tree50d01d78e293c320d636fdca7361e6ef8514d9c7 /drivers/acpi/osl.c
parent981858bd7a401aa9607d9f430d5de920025fc3ea (diff)
parentbb45e394e21eb2abc710ad43d98ebac1069bf355 (diff)
parentaad83b143008e1d406248803550bfbfc600b6398 (diff)
parent23fe36306ea489eef7dd88506bdcefdc8da39c91 (diff)
downloadlinux-dd87cc53c42f3260b7eb7f60822de0fa9e58af59.tar.xz
Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next