Merge branch 'mvebu/soc-pmsu' into mvebu/soc
authorJason Cooper <jason@lakedaemon.net>
Thu, 8 May 2014 16:06:57 +0000 (16:06 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 8 May 2014 16:06:57 +0000 (16:06 +0000)

Trivial merge