]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'picolcd' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 08:25:39 +0000 (10:25 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 08:25:39 +0000 (10:25 +0200)

Trivial merge