git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c46c948 af7c951)
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:56 +0000 (19:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:56 +0000 (19:08 +0100)
Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c


Trivial merge
Pandora Kernel Repository