From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 23 May 2011 18:28:04 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Tag: v3.0-rc1~328^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0;p=linux.git

Merge branch 'devel-stable' into for-linus

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

9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0
diff --cc arch/arm/Kconfig
index 43449305961e,9b63baba4296..7275009686e6
--- a/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