git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ff47aa 8b48463)
Merge branch 'acpi-cleanup' into acpi-hotplug
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 7 Dec 2013 00:05:17 +0000 (01:05 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 7 Dec 2013 00:05:17 +0000 (01:05 +0100)
Conflicts:
drivers/acpi/scan.c


Trivial merge
Pandora Kernel Repository