Merge branch 'for-3.2-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 22 Nov 2011 00:55:59 +0000 (00:55 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 22 Nov 2011 00:55:59 +0000 (00:55 +0000)

Trivial merge