git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67f5cd0 13f7558 03fe669)
Merge branches 'pxa-ian' and 'pxa-xm270' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Jul 2008 20:42:04 +0000 (21:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2008 20:42:04 +0000 (21:42 +0100)
Conflicts:

MAINTAINERS


Trivial merge
Pandora Kernel Repository