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>

diff --cc arch/arm/cpu/armv7/omap3/board.c
index a1c5b099165059f2fe1ccd61747a64b904382077,e6996b50f6b91e3bc5561bb7e3b1cab7a57e252e..c942fe67eeb2148c0dcce6abbaea21d3193653c2
--- 1/arch/arm/cpu/armv7/omap3/board.c
--- 2/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>

diff --cc common/cmd_gpio.c
Simple merge

diff --cc drivers/serial/serial.c
Simple merge

diff --cc include/asm-generic/gpio.h
Simple merge