git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9226134
f3ec5cc
d8ad785
a55faca
eda6f6e
49ea26d
a461a8d
ec36b16
)
Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac...
author
Russell King
<rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:06:22 +0000
(19:06 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:06:22 +0000
(19:06 +0100)
Conflicts:
arch/arm/mach-pxa/poodle.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff