]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'from-henrik' into for-next
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 Sep 2012 21:50:55 +0000 (23:50 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 Sep 2012 21:50:55 +0000 (23:50 +0200)
commit77acb89b4ee8cfa5cbcf012e0c22ed3a97d26912
tree1a9ec4db47afc35ee67283aeac00074cd9ef4447
parent7cf44d57da623a1db7d50c53463e3177cf714f91
parent1ad346a9f8ca0d266ddbfdbbbd8913782b417f35
Merge branch 'from-henrik' into for-next
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c