]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge branch 'fbdev-for-linus' into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 29 Feb 2012 22:42:55 +0000 (22:42 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Wed, 29 Feb 2012 22:42:55 +0000 (22:42 +0000)

Trivial merge