diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 20:00:44 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 20:00:44 +0100 |
| commit | dd87cc53c42f3260b7eb7f60822de0fa9e58af59 (patch) | |
| tree | 50d01d78e293c320d636fdca7361e6ef8514d9c7 | |
| parent | 981858bd7a401aa9607d9f430d5de920025fc3ea (diff) | |
| parent | bb45e394e21eb2abc710ad43d98ebac1069bf355 (diff) | |
| parent | aad83b143008e1d406248803550bfbfc600b6398 (diff) | |
| parent | 23fe36306ea489eef7dd88506bdcefdc8da39c91 (diff) | |
Merge branches 'acpi-iomem', 'acpi-pm' and 'acpi-sci' into acpi-next