tree df68108a0bd7326dc6299b96853b769220c55470
parent 0d72fa7414b250068bd12f0475b754ea8c6bb0c4
parent dce23cdba4610716c269cd298635e502e426db45
author Tom Rini <trini@ti.com> 1389369360 -0500
committer Tom Rini <trini@ti.com> 1389369360 -0500

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>