Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 8 Jan 2012 15:30:34 +0000 (15:30 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 8 Jan 2012 15:30:34 +0000 (15:30 +0000)

Trivial merge