]> git.openfabrics.org - ~emulex/infiniband.git/commit
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)
commit6659145746bcf01ac650c76e5736c5003c2db230
treed21884a7f7e20381e908f87c3682026ed6761efc
parent6cd05430eeab0668c55ff4693ab79ff559b2b5c7
parentc1c52848cef52e157468b8879fc3cae23b6f3a99
Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6

Merge omapfb and OMAP SDI fixes:

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

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