Merge branch 'fbdev-for-linus' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 22 Nov 2011 01:00:31 +0000 (01:00 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 22 Nov 2011 01:00:31 +0000 (01:00 +0000)

Trivial merge