projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f7c164 8fcfb99)
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)
Conflicts:
drivers/acpi/scan.c


Trivial merge