]> 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)
commitf616e4ff007d4f9ffdda575c3a8534d4acc48d53
treee2ef3cf5ce41c01541a3557e9d1c5847399c37a7
parent034732266536e48cfe91020590dd1513898f7c9c
parent940b97619cef93e7f135221cd723fc98177a8fca
Merge branch 'acpi-hotplug' into acpi-pci-hotplug

Conflicts:
drivers/acpi/scan.c