]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fbdev-for-linus' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Fri, 24 Feb 2012 00:47:05 +0000 (00:47 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Fri, 24 Feb 2012 00:47:05 +0000 (00:47 +0000)

Trivial merge