Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 22:29:38 +0000 (15:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Aug 2010 22:29:38 +0000 (15:29 -0700)
commitd1126ad907ce197ff45fbc2369fbeaf8ae6f75a8
tree59204d2c9d41f6d43119ff0750077dcc2223929e
parent2a554736f0d518b7c4d9939c6a6842bffebc7475
parent83e4491818040ae6b2d9fc60434616304a101d39
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:
  USB HID: Add ID for eGalax Multitouch used in JooJoo tablet
  HID: hiddev: fix memory corruption due to invalid intfdata
  HID: hiddev: protect against disconnect/NULL-dereference race
  HID: picolcd: correct ordering of framebuffer freeing
  HID: picolcd: testing the wrong variable