Russell King 3f30a09a61 Merge branch 'pxa-all' into devel ... Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/include/mach/hardware.h arch/arm/mach-pxa/spitz.c		2008-10-09 21:33:02 +01:00
..
mach	Merge branch 'pxa-all' into devel	2008-10-09 21:33:02 +01:00