]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 5 Sep 2012 09:03:52 +0000 (11:03 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 5 Sep 2012 09:03:52 +0000 (11:03 +0200)
1  2 
drivers/hid/hid-ids.h
drivers/hid/hid-wacom.c

Simple merge
Simple merge