git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5af310a 1dcc3d3)
Merge branch 'acpi-scan' into acpi-pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jul 2015 21:57:51 +0000 (23:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jul 2015 21:57:51 +0000 (23:57 +0200)
Conflicts:
drivers/acpi/scan.c

The conflict is resolved by moving the just introduced
acpi_device_is_first_physical_node() to bus.c and using
the existing acpi_companion_match() from there.

There will be an additional commit to combine the two.


Trivial merge
Pandora Kernel Repository