projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4b49b9fe2b5220374ddc1c122cc31e00cc20365f
treed8c3c3ff835da7238cc0b1d6817f7bcf5b735ecdtree | snapshot (tar.gz zip)
parent7282059489868e0ed1b0d79765730c6b233a8399commit | diff
parent21369c77477a7f937174833c8094154f0f995710commit | diff
Merge back earlier 'acpi-pci-hotplug' material.

Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
drivers/pci/hotplug/acpiphp_glue.c diff1 | diff2 | blob | history