diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 17:32:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 17:32:41 +0100 |
| commit | b169ba5ae49a810876f3baa5da5283e95c836527 (patch) | |
| tree | e2ef3cf5ce41c01541a3557e9d1c5847399c37a7 | |
| parent | 1f7c164b6f2a8a028bfc36097fc42bf061c5212e (diff) | |
| parent | 8fcfb99c8e29c73dd8945b6105ef54ca4eeb171e (diff) | |
Merge branch 'acpi-hotplug' into acpi-pci-hotplug
Conflicts:
drivers/acpi/scan.c
0 files changed, 0 insertions, 0 deletions