Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Apr 2010 15:18:02 +0000 (08:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Apr 2010 15:18:02 +0000 (08:18 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Add NOGET quirk for Quanta Pixart touchscreen
  HID: fix oops in gyration_event()


Trivial merge