git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1543966 19ec95d)
Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:32 +0000 (19:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Oct 2008 18:08:32 +0000 (19:08 +0100)
Merge branch 'pxa-viper' into pxa-machines

Conflicts:

arch/arm/mach-pxa/Makefile
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile


Trivial merge
Pandora Kernel Repository