]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:58:01 +0000 (14:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 04:58:01 +0000 (14:58 +1000)
1  2 
arch/arm/Kconfig
arch/arm/mach-shmobile/setup-r8a7740.c

Simple merge