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

Trivial merge