]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit2e8a7ca56e2aebddaa49ed176da871a2bdeaadfa
tree9909ea7d9085d185fc1774277157b20b85ec23ae
parenta61083541c3d15d4c1a6776e1d3f06ebaf9348ef
parent2f43f8749ebaeb4934f73a6f864fcbb60ce9f48a
Merge branch 'upstream' into for-next
drivers/hid/hid-ids.h
drivers/hid/hid-wacom.c