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)
commitcc513ac0f29473de365664c4fba9cf033c1f2324
tree27ee53310699caa0e5cac80d519c0ec04120f8ca
parent1543966a079fc7065849ae43ca4dd767c188ad55
parent19ec95df2c4ec2d28919f267c4d17178f8fe9d9c
Merge branch 'viper-for-rmk' of git://misterjones.org/linux-2.6-arm

Merge branch 'pxa-viper' into pxa-machines

Conflicts:

arch/arm/mach-pxa/Makefile
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
drivers/net/smc91x.c
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile