Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for...
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:06:50 +0000 (19:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:06:50 +0000 (19:06 +0200)
commitfa1054a29b21e4c932b5c93def600149451cec32
tree88ada194d3004c02dcef9fef15c6609275284368
parent6cf8c85f8bc320ca0273c5261cc13ee1491d7b92
parent9abebedb123a577ecc5b69b2a2515499e430be24
parentb95dd3ca034a044471242fcbc8b8256f272b5062
parent4522643aa9630be17238edf1b4c0b690c5dd7f5d
Merge branches 'for-3.15/multitouch', 'for-3.15/sony' and 'for-3.15/uhid' into for-linus
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c
drivers/hid/hid-sony.c
include/linux/hid.h