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

Conflicts:
	board/armltd/vexpress64/vexpress64.c

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

diff --cc board/armltd/vexpress64/vexpress64.c
index 876cb678eb03e6d469db1b1adb63de5f68831caf,071d88c07d8d8322b3c782339c2d9062d9da59da..13dd6674363cc2194a37af58f9b66a901ae426f7
--- 1/board/armltd/vexpress64/vexpress64.c
--- 2/board/armltd/vexpress64/vexpress64.c
+++ b/board/armltd/vexpress64/vexpress64.c
@@@ -11,6 -11,9 +11,8 @@@
  #include <netdev.h>
  #include <asm/io.h>
  #include <linux/compiler.h>
 -#include <asm/semihosting.h>
+ #include <dm/platdata.h>
+ #include <dm/platform_data/serial_pl01x.h>
  
  DECLARE_GLOBAL_DATA_PTR;
  

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