]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'picolcd' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 16 Aug 2012 10:04:35 +0000 (12:04 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 16 Aug 2012 10:04:35 +0000 (12:04 +0200)

Trivial merge