]> 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, 6 May 2014 01:08:07 +0000 (11:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 01:08:07 +0000 (11:08 +1000)
commit7ce074ec66bfa4a10b398a7c201cde5d2875eb63
tree95e6594264a944a815f10888aac2e0f43ee5f654
parent7584f198b8ce606f3c0c483fdf68eab971408155
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