]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit4b8d58689f92dfb571fc347f39739f90922f52a2
treee2ef3cf5ce41c01541a3557e9d1c5847399c37a7
parent74578714398571cb1e3a90a03074e63cd99efc1f
parent7b0d394a7cd4efe610d85052e02e083eb0d57a06
Merge branch 'acpi-hotplug' into acpi-pci-hotplug

Conflicts:
drivers/acpi/scan.c