Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 10 Jan 2014 15:56:00 +0000 (10:56 -0500)
committerTom Rini <trini@ti.com>
Fri, 10 Jan 2014 15:56:00 +0000 (10:56 -0500)
commit7f673c99c2d8d1aa21996c5b914f06d784b080ca
treedf68108a0bd7326dc6299b96853b769220c55470
parent8401bfa91ef57e331e2a3abdf768d41803bec88e
parent10a147bc665367111920be657409a5d56d3c0590
Merge branch 'master' of git://git.denx.de/u-boot-arm

Bringing in the MMC tree means that CONFIG_BOUNCE_BUFFER needed to be
added to include/configs/exynos5-dt.h now.

Conflicts:
include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>
15 files changed:
Makefile
arch/arm/lib/bootm.c
boards.cfg
common/board_f.c
common/fdt_support.c
include/configs/arndale.h
include/configs/balloon3.h
include/configs/exynos5-dt.h
include/configs/lp8x4x.h
include/configs/palmld.h
include/configs/palmtc.h
include/configs/zipitz2.h
spl/Makefile
tools/Makefile
tools/mxsimage.c