Merge branch 'heads/soc2' into dt3-base
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 11:01:18 +0000 (20:01 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 19 Dec 2013 11:01:18 +0000 (20:01 +0900)
commitbddd3a4c4a68db288aefc4b83d41dcc9e51dbfce
tree810c80dd8d1e9df95b3c17c47493496360b04e8b
parentde1e5515034301161b6c9d41cac04bca5cee5e4d
parent250d829f68ecb5e775a99deb03c56832acec28f4
Merge branch 'heads/soc2' into dt3-base
arch/arm/mach-shmobile/clock-r8a7790.c
arch/arm/mach-shmobile/clock-sh73a0.c