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

Simple merge