projects / platform / kernel / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32df39c 7ae8350)
Merge branch 'master' of git://git.denx.de/u-boot
authorStefano Babic <sbabic@denx.de>
Thu, 5 Mar 2015 15:05:10 +0000 (16:05 +0100)
committerStefano Babic <sbabic@denx.de>
Thu, 5 Mar 2015 15:05:10 +0000 (16:05 +0100)
1  2 
README patch | diff1 | diff2 | blob | history
arch/arm/Kconfig patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
diff --cc arch/arm/Kconfig
index eb92297,bc55e5b..8472d41
--- 1/arch/arm/Kconfig
--- 2/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"
Domain: System / Kernel;