tree 51ea4f5d2ea9c82a7d4ba51dcef7b525b18d6a6d
parent b57f95a38233a2e73b679bea4a5453a1cc2a1cc9
parent fde4e2f73208b8f34f123791e39c0cb6bc74b32a
author Linus Torvalds <torvalds@linux-foundation.org> 1273509893 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273509893 -0700

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: fix suspend crash by moving initializations earlier
  HID: sony: fix sony_set_operational_bt
  HID: ntrig: Remove unused macro, TripleTap and QuadTap
  HID: ntrig: TipSwitch for single touch mode touch.
  HID: hidraw: fix numbered reports
  HID: wacom: remove annoying non-error printk
  HID: ntrig: Emit TOUCH with DOUBLETAP for single touch
  HID: add support for cymotion master solar keyboard
  HID: ntrig: explain firmware quirk
  HID: fix N-trig touch panel with recent firmware