]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit888449e0ded81570c6c32b38f2bc4e821f4d2f57
tree17ec36b3356935370b9336c91b747e93b0919ed6
parent9dddb6e18cf0a542396d44a994bfa607c5fdebb1
parent94da9af459c15e4352b9fd5d9803173826c94d39
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/boot/dts/r8a7790-lager.dts