]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/soc-orion5x' into mvebu/for-next
authorJason Cooper <jason@lakedaemon.net>
Sun, 25 May 2014 17:20:03 +0000 (17:20 +0000)
committerJason Cooper <jason@lakedaemon.net>
Sun, 25 May 2014 17:20:03 +0000 (17:20 +0000)
1  2 
arch/arm/mach-orion5x/common.h

Simple merge