Russell King cc513ac0f2 Merge branch 'viper-for-rmk' of git://www.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		2008-10-07 19:08:32 +01:00
..
mach	Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm	2008-10-07 19:08:32 +01:00