commit 8f685fbda43deccd130d192c9fcef1444649eaca
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 13 09:58:38 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jan 13 09:58:38 2011 -0800
tree 976ed00423d03bdcaf11569a0c5c72ecb1c5c6c8
parent d24450e2075b9ceeef8ad942e6391bc73eae6933
parent 2d93666e70662cfcf1927e1a858685f5b38d5d65

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