Merge remote-tracking branch 'lsk/v3.10/topic/gicv3' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 19:45:23 +0000 (20:45 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 23:34:43 +0000 (00:34 +0100)
commit1ab056a5fb0d123436b862806734c6a9dc4651a4
tree507968eeb2f51528b9a5d728523157702f4feaf3
parent71b9f09697fc2ebacbc9e52079f2c6156f9b994f
parentb97ae0d6eac52b4fda9f0dd1d31c81dac4ddd572
Merge remote-tracking branch 'lsk/v3.10/topic/gicv3' into linux-linaro-lsk

Conflicts:
drivers/irqchip/irq-gic.c
include/linux/irqchip/arm-gic.h
arch/arm64/Kconfig
arch/arm64/kernel/head.S
drivers/irqchip/irq-gic.c
include/linux/irqchip/arm-gic.h