Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 12 Jul 2013 14:36:48 +0000 (10:36 -0400)
committerTom Rini <trini@ti.com>
Fri, 12 Jul 2013 14:36:48 +0000 (10:36 -0400)
commitfbbbc86e8ebac4f42f4ca39ceba80cea27c983bc
tree9c91526cefd027d9bd964572d4f92bd2d1376c5d
parentd72da1582895ca226b995758426ec3769b54a9b8
parentefc284e32503b240dbd35c6e8b8d098d702b4be7
Merge branch 'master' of git://git.denx.de/u-boot-arm

Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>
12 files changed:
arch/arm/dts/exynos5250.dtsi
arch/arm/include/asm/arch-exynos/cpu.h
board/samsung/dts/exynos5250-snow.dts
boards.cfg
drivers/spi/mxc_spi.c
include/configs/beaver.h
include/configs/cardhu.h
include/configs/dalmore.h
include/configs/exynos5250-dt.h
include/configs/ventana.h
include/fdtdec.h
lib/fdtdec.c