From: Tom Rini <trini@konsulko.com>
Date: Thu, 5 Mar 2015 12:22:18 +0000 (-0500)
Subject: Merge branch 'master' of git://www.denx.de/git/u-boot-imx
X-Git-Tag: v2015.04-rc4~118
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=02ebe6f702ec8d025926b0ea7c2088e302c5a302;p=u-boot

Merge branch 'master' of git://www.denx.de/git/u-boot-imx
---

02ebe6f702ec8d025926b0ea7c2088e302c5a302
diff --cc arch/arm/Kconfig
index bc55e5b1f5,eb92297cb3..8472d41565
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -842,9 -842,9 +846,10 @@@ source "board/ttcontrol/vision2/Kconfig
  source "board/udoo/Kconfig"
  source "board/vpac270/Kconfig"
  source "board/wandboard/Kconfig"
+ source "board/warp/Kconfig"
  source "board/woodburn/Kconfig"
  source "board/xaeniax/Kconfig"
 +source "board/xilinx/zynqmp/Kconfig"
  source "board/zipitz2/Kconfig"
  
  source "arch/arm/Kconfig.debug"