git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
348f31e
66efc5a
)
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
author
Dave Jones
<davej@redhat.com>
Sun, 11 Feb 2007 01:36:29 +0000
(20:36 -0500)
committer
Dave Jones
<davej@redhat.com>
Sun, 11 Feb 2007 01:36:29 +0000
(20:36 -0500)
Signed-off-by: Dave Jones <davej@redhat.com>
Trivial merge