]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.3/picolcd' into for-next
authorJiri Kosina <jkosina@suse.com>
Wed, 8 Jul 2015 09:31:59 +0000 (11:31 +0200)
committerJiri Kosina <jkosina@suse.com>
Wed, 8 Jul 2015 09:31:59 +0000 (11:31 +0200)

Trivial merge