]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-4.1/wacom' into for-next
authorJiri Kosina <jkosina@suse.cz>
Thu, 2 Apr 2015 12:58:58 +0000 (14:58 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 2 Apr 2015 12:58:58 +0000 (14:58 +0200)

Trivial merge