Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk

Conflicts (look like simple add/add stuff):
	arch/arm/Kconfig
	arch/arm/common/Makefile

diff --cc arch/arm/common/Makefile
index 6073ffb8906ea4731aa7a7b9efe1b03e6e4af330,f27d6a7af57fc40f734584668bc4574262605fcb..462cd580fc2d765bb021e78bc8e79a1b34dcaf47
--- 1/arch/arm/common/Makefile
--- 2/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@ -14,7 -14,6 +14,9 @@@ obj-$(CONFIG_SHARP_SCOOP)     += scoop.
  obj-$(CONFIG_PCI_HOST_ITE8152)  += it8152.o
  obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o
  obj-$(CONFIG_MCPM)            += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o
- AFLAGS_mcpm_head.o            := -march=armv7-a
- AFLAGS_vlock.o                        := -march=armv7-a
 +obj-$(CONFIG_BL_SWITCHER)     += bL_switcher.o
 +obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o
++
+ AFLAGS_mcpm_head.o            := -march=armv7-a
+ AFLAGS_vlock.o                        := -march=armv7-a
+ CFLAGS_REMOVE_mcpm_entry.o    = -pg

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc include/linux/irqchip/arm-gic.h
Simple merge