tree b7a5c446893448f87ddb8a330b4499ca4c0a0538
parent 0835619348b097404f4f85bc5195c6e23a2f8de4
parent c3a4924565e2eecf2539871abd123d35be6d76d5
author Linus Torvalds <torvalds@linux-foundation.org> 1308332221 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308332221 -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:
  Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"
  HID: hid-multitouch: fix broken eGalax
  HID: MAINTAINERS: Update USB HID/HIDBP DRIVERS pattern
  HID: hid-multitouch: add support for Chunghwa multi-touch panel
  HID: hiddev: fix use after free in hiddev_release
  HID: add quirk for HyperPen 10000U
  HID: hiddev: fix potential use-after-free