Merge branch 'for-next' of git://linuxtv.org/pinchartl/fbdev into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 25 Jul 2012 08:46:21 +0000 (08:46 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 25 Jul 2012 08:46:21 +0000 (08:46 +0000)

Trivial merge