Merge branch 'heads/soc2' into boards2-base
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 10:08:11 +0000 (19:08 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 10:08:11 +0000 (19:08 +0900)
commit70d4f2e5576a16120e6bc85b10011032306c1179
tree8fe170b96167ab3aeb82980d58828942fe11668a
parentbe0647d556985ae58a42e7fc3751a293c418c41e
parent250d829f68ecb5e775a99deb03c56832acec28f4
Merge branch 'heads/soc2' into boards2-base
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/board-bockw.c
arch/arm/mach-shmobile/clock-r7s72100.c
arch/arm/mach-shmobile/clock-r8a7790.c
arch/arm/mach-shmobile/clock-sh73a0.c
arch/arm/mach-shmobile/setup-r8a7790.c