]> 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)
commitfdd5933f5117fb72c0bf9c64cd593aa177a5ab76
treed8c3c3ff835da7238cc0b1d6817f7bcf5b735ecd
parentb506eff40c2d50aa33bb57da87a94ab6f98720d7
parentbf778ab2d59ecaf251990edf8c64722e48384b01
Merge back earlier 'acpi-pci-hotplug' material.

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