Merge branch 'devel-stable' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ns9xxx/include/mach/uncompress.h

diff --cc arch/arm/Kconfig
index 4344930,9b63bab..7275009
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1026,7 -1034,7 +1027,8 @@@ config PLAT_IO
  
  config PLAT_ORION
        bool
 +      select CLKSRC_MMIO
+       select GENERIC_IRQ_CHIP
        select HAVE_SCHED_CLOCK
  
  config PLAT_PXA

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/mach-mxs/Kconfig
Simple merge

diff --cc arch/arm/plat-mxc/time.c
Simple merge

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/gpio.c
Simple merge