Merge remote-tracking branch 'c6x/for-linux-next'

Conflicts:
	arch/arm/Kconfig

diff --cc arch/arm/Kconfig
index c06647d9f10314684f7a56f0ddeb0257d0211eaa,7db8abe071f443365bf29a9c8085694232816e47..b6a708ef6067124e3b8b7e3d0cc8aebccb72787d
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -5,7 -5,7 +5,8 @@@ config AR
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
        select ARCH_HAVE_CUSTOM_GPIO_H
 +      select ARCH_USE_CMPXCHG_LOCKREF
+       select ARCH_MIGHT_HAVE_PC_PARPORT
        select ARCH_WANT_IPC_PARSE_VERSION
        select BUILDTIME_EXTABLE_SORT if MMU
        select CLONE_BACKWARDS

diff --cc arch/sparc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge