Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 13 Mar 2012 23:19:58 +0000 (23:19 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 13 Mar 2012 23:19:58 +0000 (23:19 +0000)

Trivial merge