Merge branch 'for-3.3-rc' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 28 Jan 2012 19:37:39 +0000 (19:37 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 28 Jan 2012 19:37:39 +0000 (19:37 +0000)

Trivial merge