]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpi-pci-hotplug' into acpi-ost
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:06:58 +0000 (01:06 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:06:58 +0000 (01:06 +0100)
1  2 
drivers/acpi/scan.c
include/acpi/acpi_bus.h

Simple merge
Simple merge