Merge branch 'for-3.4' of git://gitorious.org/linux-omap-dss2/linux into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 20 Mar 2012 08:49:51 +0000 (08:49 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 20 Mar 2012 08:49:51 +0000 (08:49 +0000)

Trivial merge