projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6328a0 e70dba6)
Merge back earlier acpi-pnp material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jul 2014 22:24:40 +0000 (00:24 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 29 Jul 2014 22:24:40 +0000 (00:24 +0200)
Conflicts:
drivers/pnp/pnpacpi/core.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.