Merge commit 'v3.2-rc6' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 17 Dec 2011 22:00:49 +0000 (22:00 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 17 Dec 2011 22:00:49 +0000 (22:00 +0000)

Trivial merge