git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7282059 21369c7)
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)
Conflicts:
drivers/pci/hotplug/acpiphp_glue.c


Trivial merge
Pandora Kernel Repository