From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 9 May 2014 08:47:05 +0000 (+0200)
Subject: Merge branch 'u-boot/master'
X-Git-Tag: v2014.07-rc1~2^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19

Merge branch 'u-boot/master'

Conflicts:
	drivers/net/Makefile

(trivial merge)
---

d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19
diff --cc tools/Makefile
index 911ad43590,c34df4f897..6e43a0150d
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -72,9 -72,9 +72,11 @@@ dumpimage-mkimage-objs := aisimage.o 
  			$(FIT_SIG_OBJS-y) \
  			crc32.o \
  			default_image.o \
+ 			fdtdec.o \
+ 			fit_common.o \
  			fit_image.o \
 +			gpimage.o \
 +			gpimage-common.o \
  			image-fit.o \
  			image-host.o \
  			image.o \