summaryrefslogtreecommitdiff
path: root/net/dccp
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 09:58:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 09:58:38 -0800
commit8f685fbda43deccd130d192c9fcef1444649eaca (patch)
tree976ed00423d03bdcaf11569a0c5c72ecb1c5c6c8 /net/dccp
parentd24450e2075b9ceeef8ad942e6391bc73eae6933 (diff)
parent2d93666e70662cfcf1927e1a858685f5b38d5d65 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: hid-multitouch: minor fixes based on additional review HID: Switch turbox/mosart touchscreen to hid-mosart HID: add Add Cando touch screen 10.1-inch product id HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger' HID: hid-multitouch: add support for Cypress TrueTouch panels HID: hid-multitouch: support for PixCir-based panels HID: set HID_MAX_FIELD at 128 HID: add feature_mapping callback
Diffstat (limited to 'net/dccp')
0 files changed, 0 insertions, 0 deletions