Merge branch 'iks' of git://git.linaro.org/people/nico/linux into lsk-v3.10-iks

author Mark Brown <broonie@linaro.org>

Wed, 17 Jul 2013 17:34:04 +0000 (18:34 +0100)

committer Mark Brown <broonie@linaro.org>

Wed, 17 Jul 2013 17:34:04 +0000 (18:34 +0100)
author Mark Brown <broonie@linaro.org>
Wed, 17 Jul 2013 17:34:04 +0000 (18:34 +0100)
committer Mark Brown <broonie@linaro.org>
Wed, 17 Jul 2013 17:34:04 +0000 (18:34 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/smp.c
Simple merge
diff --cc drivers/irqchip/irq-gic.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Wed, 17 Jul 2013 17:34:04 +0000 (18:34 +0100)
committer	Mark Brown <broonie@linaro.org>
	Wed, 17 Jul 2013 17:34:04 +0000 (18:34 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/irqchip/irq-gic.c	patch \|	diff1 \|	diff2 \|	blob \| history