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)

Trivial merge