Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 15 Oct 2011 00:19:52 +0000 (00:19 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 15 Oct 2011 00:19:52 +0000 (00:19 +0000)
commitef26b7943c5821aaff1efc14c098840c49fe15c0
treea91834ef396633c5c56a0597c2fc525e0684fc30
parent07aaae44f5a3962c3a410a6dd7936dfa7dece2b9
parent3e28189038bb831512cf4f8313e1aead97c3e63f
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next
drivers/media/video/omap/omap_vout.c
drivers/video/omap2/displays/panel-taal.c