git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 949db15 b8bd759)
Merge branch 'acpi-scan' into acpi-cleanup
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Jan 2013 23:36:44 +0000 (00:36 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 25 Jan 2013 23:36:44 +0000 (00:36 +0100)
The following commits depend on the 'acpi-scan' material.

1  2 
drivers/acpi/acpi_memhotplug.c patch | diff1 | diff2 | blob | history
drivers/acpi/device_pm.c patch | diff1 | diff2 | blob | history
drivers/acpi/glue.c patch | diff1 | diff2 | blob | history
drivers/acpi/scan.c patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/acpi_memhotplug.c
Simple merge
diff --cc drivers/acpi/device_pm.c
Simple merge
diff --cc drivers/acpi/glue.c
Simple merge
diff --cc drivers/acpi/scan.c
Simple merge
Pandora Kernel Repository