]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ARM: iop: fix mismerge of Kconfig
authorOlof Johansson <olof@lixom.net>
Sat, 22 Sep 2012 18:07:51 +0000 (11:07 -0700)
committerArnd Bergmann <arnd@arndb.de>
Tue, 2 Oct 2012 13:30:36 +0000 (15:30 +0200)
commit947cabbdd5a7c3d617a942f03cf7a435a4e35168
tree9fa642c579322a61765539ba28bd5b67fbe9c390
parent974a847e00cf3ff1695e62b276892137893706ab
ARM: iop: fix mismerge of Kconfig

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/Kconfig