]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'planes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 24 Jun 2012 13:58:53 +0000 (13:58 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Sun, 24 Jun 2012 13:58:53 +0000 (13:58 +0000)

Trivial merge