Merge remote-tracking branch 'lts/linux-3.10.y' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig
index 4fd9e56ef652acdc78e6e0d34e650f0e14b5949e,0677ff4814fa0f9bd16661a539b7b787a0a4d591..3a8bfb12f7262b3fb1bffda3ab941cf2190f1007
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -1,9 -1,7 +1,10 @@@
  config ARM64
        def_bool y
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 +      select ARCH_USE_CMPXCHG_LOCKREF
 +      select ARCH_HAS_OPP
 +      select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+       select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        select ARCH_WANT_FRAME_POINTERS

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/irqchip/irq-gic.c
index 65bc83747f6664a3c37c6bb8c109d2ed2de93df6,c8ee1cb023b864dbdfe8b04502c48feb88683c80..c366bab39df08d1f46d531527e2288f6927433b8
--- 1/drivers/irqchip/irq-gic.c
--- 2/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -41,8 -41,8 +41,9 @@@
  #include <linux/slab.h>
  #include <linux/irqchip/chained_irq.h>
  #include <linux/irqchip/arm-gic.h>
 +#include <trace/events/arm-ipi.h>
  
+ #include <asm/cputype.h>
  #include <asm/irq.h>
  #include <asm/exception.h>
  #include <asm/smp_plat.h>

diff --cc kernel/sched/debug.c
Simple merge