Trivial merge conflict, needed to manually remove
local_info as per commit
|
||
|---|---|---|
| .. | ||
| displaymode.txt | ||
| exynos-dp.txt | ||
| exynos-fb.txt | ||
| exynos_mipi_dsi.txt | ||
| sandbox-fb.txt | ||
| simple-framebuffer.txt | ||
| tegra20-dc.txt | ||
Trivial merge conflict, needed to manually remove
local_info as per commit
|
||
|---|---|---|
| .. | ||
| displaymode.txt | ||
| exynos-dp.txt | ||
| exynos-fb.txt | ||
| exynos_mipi_dsi.txt | ||
| sandbox-fb.txt | ||
| simple-framebuffer.txt | ||
| tegra20-dc.txt | ||