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)

Trivial merge