From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Mar 2012 16:48:24 +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=5d329e245f9a1edb905284730650a0c6c806fb2e;p=~shefty%2Frdma-dev.git

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

Pull from Jiri Kosina:
 "Please pull to receive updates for HID layer.  Nikolai's patch is
  rather important and should still go in for 3.3, as it's a regression
  fix for commit b4b583d."

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: hid-input: allow array fields out of range
  HID: usbhid: Add NOGET quirk for the AIREN Slim+ keyboard
---

5d329e245f9a1edb905284730650a0c6c806fb2e