Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
Florian Tobias Schandinat [Sat, 15 Oct 2011 00:19:52 +0000 (00:19 +0000)]
1  2 
drivers/media/video/omap/omap_vout.c
drivers/video/omap2/displays/panel-taal.c

Simple merge