Merge branch 'for-next' of git://linuxtv.org/pinchartl/fbdev into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 13 Mar 2012 23:17:43 +0000 (23:17 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 13 Mar 2012 23:17:43 +0000 (23:17 +0000)

Trivial merge