]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/soc' into for-next
authorJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:02:15 +0000 (18:02 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:02:15 +0000 (18:02 +0000)
1  2 
arch/arm/Kconfig
arch/arm/mach-kirkwood/common.c

Simple merge
Simple merge