Commits

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
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