Merge remote-tracking branch 'arm/for-next'

diff --cc arch/arm/Kconfig
index 30dc5f5aaa790c2191df9ab16d39c6e88dcec418,a37ee58c6cf32ee1e4e06850b7dcc0721865f367..22e2ca6f01cf45681b5ff55be97b63624a05350b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -28,10 -27,9 +28,10 @@@ config AR
        select ARCH_WANT_IPC_PARSE_VERSION
        select BUILDTIME_EXTABLE_SORT if MMU
        select CLONE_BACKWARDS
-       select CPU_PM if (SUSPEND || CPU_IDLE)
+       select CPU_PM if SUSPEND || CPU_IDLE
        select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
        select DMA_DIRECT_OPS if !MMU
 +      select DMA_REMAP if MMU
        select EDAC_SUPPORT
        select EDAC_ATOMIC_SCRUB
        select GENERIC_ALLOCATOR

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

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

diff --cc drivers/pcmcia/Kconfig
Simple merge