]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 00:37:16 +0000 (10:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 10 Jun 2014 00:37:16 +0000 (10:37 +1000)
Conflicts:
arch/arm/boot/dts/r8a7790-lager.dts


Trivial merge