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)
1  2 
arch/arm/mach-shmobile/clock-r8a7790.c
arch/arm/mach-shmobile/clock-sh73a0.c

Simple merge