diff options
| author | Tom Rini <trini@ti.com> | 2014-01-10 15:56:00 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-01-10 15:56:00 (GMT) |
| commit | 7f673c99c2d8d1aa21996c5b914f06d784b080ca (patch) | |
| tree | df68108a0bd7326dc6299b96853b769220c55470 /include/mtd | |
| parent | 8401bfa91ef57e331e2a3abdf768d41803bec88e (diff) | |
| parent | 10a147bc665367111920be657409a5d56d3c0590 (diff) | |
| download | u-boot-fsl-qoriq-7f673c99c2d8d1aa21996c5b914f06d784b080ca.tar.xz | |
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>
Diffstat (limited to 'include/mtd')
0 files changed, 0 insertions, 0 deletions