Russell King 5a89770daa Merge branches 'pxa-core' and 'pxa-machines' into pxa-all ... Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c		2008-10-07 19:08:56 +01:00
..
asm	Merge branches 'pxa-core' and 'pxa-machines' into pxa-all	2008-10-07 19:08:56 +01:00