OSDN Git Service

Merge branch 'acpi-hotplug' into acpi-pci-hotplug
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 Feb 2014 16:32:41 +0000 (17:32 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 6 Feb 2014 16:32:41 +0000 (17:32 +0100)
commitb169ba5ae49a810876f3baa5da5283e95c836527
treee2ef3cf5ce41c01541a3557e9d1c5847399c37a7
parent1f7c164b6f2a8a028bfc36097fc42bf061c5212e
parent8fcfb99c8e29c73dd8945b6105ef54ca4eeb171e
Merge branch 'acpi-hotplug' into acpi-pci-hotplug

Conflicts:
drivers/acpi/scan.c