[ARM] Merge most of the PXA work for initial merge

This includes PXA work up to the SPI changes for the initial merge,
since e172274ccc55d20536fbdceb6131f38e288541e0 depends on the SPI
tree being merged.

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/configs/xm_x270_defconfig
index 33b201c,7b3576e..aa40d91
--- 1/arch/arm/configs/cm_x270_defconfig
--- 2/arch/arm/configs/xm_x270_defconfig
+++ b/arch/arm/configs/xm_x270_defconfig
@@@ -192,10 -249,15 +249,14 @@@ CONFIG_PCCARD_NONSTATIC=
  #
  # Kernel Features
  #
- # CONFIG_TICK_ONESHOT is not set
+ CONFIG_TICK_ONESHOT=y
+ CONFIG_NO_HZ=y
 -# CONFIG_NO_IDLE_HZ is not set
+ # CONFIG_HIGH_RES_TIMERS is not set
+ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
  # CONFIG_PREEMPT is not set
  CONFIG_HZ=100
- # CONFIG_AEABI is not set
+ CONFIG_AEABI=y
+ CONFIG_OABI_COMPAT=y
  # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
  CONFIG_SELECT_MEMORY_MODEL=y
  CONFIG_FLATMEM_MANUAL=y

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

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

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/gadget/pxa27x_udc.c
Simple merge

diff --cc drivers/video/pxafb.c
Simple merge

diff --cc include/asm-arm/arch-pxa/pxa2xx-gpio.h
Simple merge