git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: caa73ea f244d8b)
Merge branch 'acpi-pci-hotplug' into acpi-hotplug
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 31 Dec 2013 12:41:08 +0000 (13:41 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 31 Dec 2013 12:41:08 +0000 (13:41 +0100)
Conflicts:
include/acpi/acpi_bus.h


Trivial merge
Pandora Kernel Repository