git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d271657
7919010
)
Merge branch 'acpi-config' into acpica
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Tue, 18 Mar 2014 00:53:28 +0000
(
01:53
+0100)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Tue, 18 Mar 2014 00:53:28 +0000
(
01:53
+0100)
Conflicts:
include/acpi/platform/aclinux.h
Trivial merge