]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:50:30 +0000 (09:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 May 2014 23:50:30 +0000 (09:50 +1000)
Conflicts:
arch/arm/boot/dts/Makefile

1  2 
arch/arm/mach-shmobile/board-armadillo800eva.c