Merge omapfb and OMAP SDI fixes: * OMAPFB: fix framebuffer console colors * OMAPDSS: Fix SDI PLL locking Conflicts: drivers/video/omap2/dss/sdi.c |
||
---|---|---|
.. | ||
displays | ||
dss | ||
omapfb | ||
Kconfig | ||
Makefile | ||
vram.c | ||
vrfb.c |
Merge omapfb and OMAP SDI fixes: * OMAPFB: fix framebuffer console colors * OMAPDSS: Fix SDI PLL locking Conflicts: drivers/video/omap2/dss/sdi.c |
||
---|---|---|
.. | ||
displays | ||
dss | ||
omapfb | ||
Kconfig | ||
Makefile | ||
vram.c | ||
vrfb.c |