projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ec19628 dc7ad3b)
Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:28:04 +0000 (19:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
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 patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history
arch/arm/boot/compressed/head.S patch | diff1 | diff2 | blob | history
arch/arm/mach-mxs/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/plat-mxc/time.c patch | diff1 | diff2 | blob | history
arch/arm/plat-omap/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/plat-omap/gpio.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
index 43449305961e63db530f525b44a804b7cba87085,9b63baba42963f82a37c37df2b721a2eaecb8e39..7275009686e64a9336ff6fb902d57c6363f1d4fd
--- 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