| commit | 9ccad66f0171578445175ecd3bf66b35a96aaf6e | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sat Dec 07 01:05:17 2013 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Sat Dec 07 01:05:17 2013 +0100 |
| tree | 78c1be21493ef183de9444cf0d2bfb1e729b0698 | |
| parent | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee [diff] | |
| parent | 8b48463f89429af408ff695244dc627e1acff4f7 [diff] |
Merge branch 'acpi-cleanup' into acpi-hotplug Conflicts: drivers/acpi/scan.c