Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-tegra

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc board/toradex/colibri_t20/colibri_t20.c
index 73ef4d2,c58d202..1df9697
--- 1/board/toradex/colibri_t20/colibri_t20.c
--- 2/board/toradex/colibri_t20/colibri_t20.c
+++ b/board/toradex/colibri_t20/colibri_t20.c
@@@ -4,6 -4,7 +4,8 @@@
   */
  
  #include <common.h>
+ #include <env.h>
++#include <fdt_support.h>
  #include <init.h>
  #include <log.h>
  #include <asm/arch/clock.h>