Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Thu, 18 Jul 2013 15:46:29 +0000 (16:46 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 18 Jul 2013 15:46:29 +0000 (16:46 +0100)
commit9bca3d7f7c5865700303e8bce0eac57bab76bcc7
tree2e31b6d77ab5d206e5cada5590100150774cf3f9
parent38b52683569174d95efcb60edfb4985be0e023b5
parentdc2ed0827570f07ab496e9742d48eaaac07e4ff8
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
arch/arm/common/Makefile
drivers/irqchip/irq-gic.c
include/linux/irqchip/arm-gic.h