From: Tom Rini <trini@konsulko.com>
Date: Fri, 3 Apr 2015 13:14:38 +0000 (-0400)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-tegra
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2;p=u-boot.git

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>
---

692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2
diff --cc board/armltd/vexpress64/vexpress64.c
index 876cb678eb,071d88c07d..13dd667436
--- a/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;