]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.6/wacom' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 16 Feb 2016 19:41:44 +0000 (20:41 +0100)
committerJiri Kosina <jkosina@suse.cz>
Tue, 16 Feb 2016 19:41:44 +0000 (20:41 +0100)

Trivial merge