Merge commit 'v3.3-rc1' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 28 Jan 2012 19:52:40 +0000 (19:52 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 28 Jan 2012 19:52:40 +0000 (19:52 +0000)

Trivial merge