]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 00:58:00 +0000 (10:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 May 2014 00:58:00 +0000 (10:58 +1000)
commita7f397a45a91aa75f7134d13377b83acab08496f
tree29d17e57ab57de70979f03e259fd30f32786090b
parentc5dc26197330ed9ce01dafac2f62a06b7f665a1b
parent74be6be684a8c5b36665a927cb301ee0b584ecad
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