]> git.baikalelectronics.ru Git - kernel.git/commit
Merge back earlier 'acpi-pci-hotplug' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 12 Feb 2014 11:56:56 +0000 (12:56 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 12 Feb 2014 11:56:56 +0000 (12:56 +0100)
commit9d92a70389b8522c5858dbc1ba75319a0671ea30
treed8c3c3ff835da7238cc0b1d6817f7bcf5b735ecd
parentc4c61222ebf13f00f0660b178f79b702219b5910
parent0e3b5dfa87610b14f619c164cc20bbda053fed33
Merge back earlier 'acpi-pci-hotplug' material.

Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/hotplug/acpiphp_glue.c