]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 01:42:22 +0000 (11:42 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 01:42:22 +0000 (11:42 +1000)
commit53ffaa1947844fcea0273c34c21665d9bd880dd0
treef347daa097d771ed1343a414fe0e44dcff27d7ff
parent685eff8a3f1ac16c9caf431192daefb9060ae1e1
parent9dad42f58025c4dced7378d88bdeb76744edd5bc
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