]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
projects / karo-tx-uboot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8401bfa 10a147b)
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
treedf68108a0bd7326dc6299b96853b769220c55470tree | snapshot
parent8401bfa91ef57e331e2a3abdf768d41803bec88ecommit | diff
parent10a147bc665367111920be657409a5d56d3c0590commit | diff
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 diff1 | diff2 | blob | history
arch/arm/lib/bootm.c diff1 | diff2 | blob | history
boards.cfg diff1 | diff2 | blob | history
common/board_f.c diff1 | diff2 | blob | history
common/fdt_support.c diff1 | diff2 | blob | history
include/configs/arndale.h diff1 | diff2 | blob | history
include/configs/balloon3.h diff1 | diff2 | blob | history
include/configs/exynos5-dt.h | diff2 | blob | history
include/configs/lp8x4x.h diff1 | diff2 | blob | history
include/configs/palmld.h diff1 | diff2 | blob | history
include/configs/palmtc.h diff1 | diff2 | blob | history
include/configs/zipitz2.h diff1 | diff2 | blob | history
spl/Makefile diff1 | diff2 | blob | history
tools/Makefile diff1 | diff2 | blob | history
tools/mxsimage.c diff1 | diff2 | blob | history
UBoot for KaRo TX COM modules