Merge branch 'fbdev-for-linus' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 8 Jul 2012 14:00:47 +0000 (14:00 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 8 Jul 2012 14:00:47 +0000 (14:00 +0000)

Trivial merge