From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Jun 2011 17:37:01 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~17247
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d9cbf022bb75497fa2ecd7ae166fc92b000ad46e;p=mirror_ubuntu-artful-kernel.git

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
---

d9cbf022bb75497fa2ecd7ae166fc92b000ad46e