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

Trivial merge