]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'renesas/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:07:39 +0000 (16:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:07:39 +0000 (16:07 +1000)
commit33a08966f36323b116d69d525d7a5bacc407e0f5
treef62f9ff7e7c1d92ca6abdd447c124eda8cfb6829
parentbfde891afda89af975fe00e47f4a7943ad2b3a85
parent58967ce0a838095d0f26eef785b68503918576db
Merge remote-tracking branch 'renesas/next'

Conflicts:
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/clock-r8a7778.c
arch/arm/mach-shmobile/include/mach/r8a7778.h
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/board-armadillo800eva.c