]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 01:40:48 +0000 (11:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 01:40:48 +0000 (11:40 +1000)
commit07466b7a51120c2c10bcd0819c7f4f44fc1e9aec
tree64ff116ae2505e3a20b6e887595bf2fd6c6106d2
parent97a4283758ac4bdea88e90ee59ea45df0c52c3da
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