Merge branch 'sh-soc' into sh-sci2-base
authorSimon Horman <horms+renesas@verge.net.au>
Tue, 24 Dec 2013 12:50:13 +0000 (21:50 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Tue, 24 Dec 2013 12:50:13 +0000 (21:50 +0900)

Trivial merge