Albert ARIBAUD ab6423cae0 Merge branch 'u-boot/master' into 'u-boot-arm/master' ...

Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.

Conflicts:
	board/samsung/common/board.c

2014-03-25 10:53:15 +01:00

..

displaymode.txt

…

exynos_mipi_dsi.txt

video:mipidsim:fdt: Add DT support for mipi dsim driver

2014-03-12 19:54:59 +09:00

exynos-dp.txt

EXYNOS5: Add device node for DP

2013-03-27 21:23:18 +09:00

exynos-fb.txt

…

sandbox-fb.txt

sandbox: Add LCD driver

2014-03-17 20:05:49 -06:00

simple-framebuffer.txt

lcd: add functions to set up simplefb device tree

2013-06-05 22:40:03 +02:00

tegra20-dc.txt

…