]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'picolcd' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sat, 8 Sep 2012 19:19:29 +0000 (21:19 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 8 Sep 2012 19:19:29 +0000 (21:19 +0200)

Trivial merge