Merge branch 'mvebu/soc-3xx' into mvebu/soc
authorJason Cooper <jason@lakedaemon.net>
Sat, 1 Mar 2014 03:20:55 +0000 (03:20 +0000)
committerJason Cooper <jason@lakedaemon.net>
Sat, 1 Mar 2014 03:20:55 +0000 (03:20 +0000)

Trivial merge