Merge branch 'soc-r8a7778' into boards-bockw-base
Simon Horman [Fri, 5 Apr 2013 02:32:38 +0000 (11:32 +0900)]

Trivial merge