]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:09:28 +0000 (10:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Apr 2014 00:09:28 +0000 (10:09 +1000)
1  2 
arch/arm/boot/dts/Makefile
arch/arm/mach-shmobile/clock-r8a7778.c

Simple merge