]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/soc' into for-next
authorJason Cooper <jason@lakedaemon.net>
Thu, 2 Jan 2014 15:17:22 +0000 (15:17 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 2 Jan 2014 15:17:22 +0000 (15:17 +0000)

Trivial merge