Merge branch 'u-boot/master'

Conflicts:
	drivers/net/Makefile

(trivial merge)

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc boards.cfg
Simple merge

diff --cc common/env_mmc.c
Simple merge

diff --cc include/configs/am335x_evm.h
Simple merge

diff --cc include/fdt_support.h
Simple merge

diff --cc include/image.h
Simple merge

diff --cc tools/Makefile
index 911ad435900d2c24f5ac7a93f2cfa32b221df369,c34df4f8978251cb58f317884d394c53bbdcef83..6e43a0150d41d200bdd4097bcdc2c5a3af792277
--- 1/tools/Makefile
--- 2/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 \

diff --cc tools/env/fw_env.c
Simple merge