From: Tom Rini <trini@ti.com>
Date: Sun, 26 Oct 2014 18:03:08 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-dm
X-Git-Tag: v2015.01-rc1~129
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=84a6df09c78bc9e9cbc6265d99c9097f5f1079f2;p=oweals%2Fu-boot.git

Merge git://git.denx.de/u-boot-dm

Fix a trivial conflict over adding <dm.h>

Conflicts:
	arch/arm/cpu/armv7/omap3/board.c

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

84a6df09c78bc9e9cbc6265d99c9097f5f1079f2
diff --cc arch/arm/cpu/armv7/omap3/board.c
index a1c5b09916,e6996b50f6..c942fe67ee
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@@ -17,7 -17,7 +17,8 @@@
   * SPDX-License-Identifier:	GPL-2.0+
   */
  #include <common.h>
+ #include <dm.h>
 +#include <mmc.h>
  #include <spl.h>
  #include <asm/io.h>
  #include <asm/arch/sys_proto.h>