git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cd0543 c1c5284)
Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 11 Sep 2012 08:28:59 +0000 (11:28 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 11 Sep 2012 08:28:59 +0000 (11:28 +0300)
Merge omapfb and OMAP SDI fixes:

* OMAPFB: fix framebuffer console colors
* OMAPDSS: Fix SDI PLL locking

Conflicts:
drivers/video/omap2/dss/sdi.c


Trivial merge
Pandora Kernel Repository