tree e65443cca9879cb7feab51cf88ad123c85d7737e
parent a5939eefdcacd3ece57d56167a43bcc0d93733bf
parent 883e0e366209067e690356e58e19bb2e6693b839
author Linus Torvalds <torvalds@linux-foundation.org> 1330966104 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1330966104 -0800

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