git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e83dda0 ab0fd67)
Merge branch 'acpi-conversion' into acpi-assorted
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 16 Oct 2013 15:04:41 +0000 (17:04 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 16 Oct 2013 15:04:41 +0000 (17:04 +0200)
The following commits depend on the 'acpi-conversion' material.

Conflicts:
drivers/acpi/acpi_platform.c


Trivial merge
Pandora Kernel Repository