diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-06 19:05:17 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-06 19:05:17 -0500 |
| commit | 9ccad66f0171578445175ecd3bf66b35a96aaf6e (patch) | |
| tree | 78c1be21493ef183de9444cf0d2bfb1e729b0698 /drivers/xen/mcelog.c | |
| parent | 8ff47aafb25cc80417118e4968d4e7ca3f46c3ee (diff) | |
| parent | 8b48463f89429af408ff695244dc627e1acff4f7 (diff) | |
Merge branch 'acpi-cleanup' into acpi-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'drivers/xen/mcelog.c')
0 files changed, 0 insertions, 0 deletions