From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Tue, 11 Sep 2012 08:28:59 +0000 (+0300)
Subject: Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6
X-Git-Tag: v3.7-rc1~48^2~1^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6659145746bcf01ac650c76e5736c5003c2db230;p=pandora-kernel.git

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
---

6659145746bcf01ac650c76e5736c5003c2db230
Reading git-diff-tree failed