]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/soc' into mvebu/for-next
authorJason Cooper <jason@lakedaemon.net>
Tue, 24 Jun 2014 11:45:13 +0000 (11:45 +0000)
committerJason Cooper <jason@lakedaemon.net>
Tue, 24 Jun 2014 11:45:13 +0000 (11:45 +0000)
1  2 
arch/arm/mach-mvebu/Kconfig

Simple merge