Merge commit 'v3.1-rc9' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 15 Oct 2011 00:14:01 +0000 (00:14 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sat, 15 Oct 2011 00:14:01 +0000 (00:14 +0000)

Trivial merge