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)
commit483f64c430ad981188d865ee635f3f7a469f0b12
tree49fcb77999fa29dc111c1255133224e69974383e
parentbc53ba2918bef821dec3528397bc49cd55291e56
parentc565c54d9bf336ec9cd22288d3aa4fb6e372e727
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

* '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()