Merge branch 'devel-stable' into for-linus
Russell King [Mon, 23 May 2011 18:28:04 +0000 (19:28 +0100)]
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h

1  2 
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/mach-mxs/Kconfig
arch/arm/plat-mxc/time.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/gpio.c

@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge