Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6

Browse source

Merge omapfb and OMAP SDI fixes:

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

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

...

This commit is contained in:

Tomi Valkeinen 2012-09-11 11:28:59 +03:00

parent 6cd05430ee c1c52848ce

commit 6659145746

5 changed files with 18 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/video/auo_k190x.c

View file

2

drivers/video/console/bitblit.c

View file

2

drivers/video/console/fbcon.c

View file

2

drivers/video/mb862xx/mb862xxfbdrv.c

View file

15

drivers/video/omap2/dss/sdi.c

View file