Merge commit 'v3.2-rc2' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 21 Nov 2011 23:42:06 +0000 (23:42 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Mon, 21 Nov 2011 23:42:06 +0000 (23:42 +0000)

Trivial merge