Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/littleton.c
Simple merge

diff --cc arch/arm/mach-pxa/mxm8x10.c
Simple merge

diff --cc arch/arm/mach-pxa/raumfeld.c
Simple merge

diff --cc arch/arm/mach-pxa/zylonite.c
Simple merge