]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/fixes-non-critical' into HEAD
authorArnd Bergmann <arnd@arndb.de>
Mon, 24 Jun 2013 14:48:35 +0000 (16:48 +0200)
committerOlof Johansson <olof@lixom.net>
Tue, 25 Jun 2013 20:39:14 +0000 (13:39 -0700)
1  2 
arch/arm/mach-mxs/Kconfig

Simple merge