]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:08:23 +0000 (10:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:08:23 +0000 (10:08 +1000)
commitce10cb6c263639f5e2fcc36eeddd137d222cc718
tree7e0ab247687dcbce8d32394ce3aa95d66f148658
parent6fea3ef3d6b27282d3b34a00ea29eced272f8013
parentd76beebbb3834898e79a2d897ff5f0927a5cbe96
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/mach-mvebu/board-v7.c
arch/arm/boot/dts/Makefile
arch/arm/mach-mvebu/board-v7.c