]> git.karo-electronics.de Git - karo-tx-linux.git/commit
arm: soc: fix mismerge
authorOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 04:58:23 +0000 (21:58 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 22 May 2014 04:58:23 +0000 (21:58 -0700)
commitd6393d54251c180ada4e4d2b1fe4b8554eb744b0
tree6b223e19f474922d265eb77a94e3a8724ba44761
parent21985e43017fa5ddb07e444625bcd2905f96964f
arm: soc: fix mismerge

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/r8a7790-lager.dts