]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'wacom' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sun, 13 Nov 2011 20:33:27 +0000 (21:33 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sun, 13 Nov 2011 20:33:27 +0000 (21:33 +0100)

Trivial merge