Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:03:08 +0000 (14:03 -0400)
committerTom Rini <trini@ti.com>
Sun, 26 Oct 2014 18:03:08 +0000 (14:03 -0400)
commit84a6df09c78bc9e9cbc6265d99c9097f5f1079f2
tree3b2bf1b3689e9aad0d20f5a69ada168cae3cc769
parentc69ecd9722af22d50295eff81d0b9cd5b8adc2e0
parentc2ded962d4703a3f9522553004db4a6fe540f7e6
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>
arch/arm/cpu/armv7/omap3/board.c
common/cmd_gpio.c
drivers/serial/serial.c
include/asm-generic/gpio.h