From: Stefano Babic <sbabic@denx.de>
Date: Thu, 5 Mar 2015 15:05:10 +0000 (+0100)
Subject: Merge branch 'master' of git://git.denx.de/u-boot
X-Git-Tag: v2015.04-rc5~64^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b5b60a05cb8bba2d135439419b2030764e359bd;p=pandora-u-boot.git

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

9b5b60a05cb8bba2d135439419b2030764e359bd
diff --cc arch/arm/Kconfig
index eb92297cb3b,bc55e5b1f5e..8472d415659
--- 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"