From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Sep 2011 23:45:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://twin.jikos.cz/jikos/hid
X-Git-Tag: v3.1-rc6~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d0283ebc8718f793a14971041b1c99afce714ac;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'for-linus' of git://twin.jikos.cz/jikos/hid

* 'for-linus' of git://twin.jikos.cz/jikos/hid:
  HID: wacom: Unregister sysfs attributes on remove
  HID: wacom: Fix error path of power-supply initialization
  HID: add support for HuiJia USB Gamepad connector
  HID: magicmouse: ignore 'ivalid report id' while switching modes, v2
  HID: magicmouse: Set resolution of touch surfaces
---

3d0283ebc8718f793a14971041b1c99afce714ac