From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Feb 2012 22:06:11 +0000 (-0800)
Subject: Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e25c173379d1053f0851fa924cd608fc0b16252f;p=~shefty%2Frdma-dev.git

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: wiimote: fix invalid power_supply_powers call
  HID: wacom: Fix invalid power_supply_powers calls
  HID: hyperv: Properly disconnect the input device
  HID: usbhid: fix dead lock between open and disconect
---

e25c173379d1053f0851fa924cd608fc0b16252f