git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9da4f7 9388704)
Merge branch 'pxa-tosa' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:01 +0000 (21:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:01 +0000 (21:43 +0100)
Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/tosa.c
arch/arm/mach-pxa/spitz.c


Trivial merge
Pandora Kernel Repository