]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:18:49 +0000 (10:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 00:18:49 +0000 (10:18 +1000)
commitddcf075fce33bafe33ea58211cfdc674cc97579e
tree81c4e68bb19e40480ef3ade80d97d2d5263d7b32
parentad33bb990bf876ee8cc2ced404cb411f1b9b11ac
parent00a6a511a257678107f3d266f749063de4bc2f9c
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-mvebu/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/mach-mvebu/Kconfig
drivers/irqchip/irq-armada-370-xp.c