From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 11 Jul 2012 18:29:59 +0000 (-0700)
Subject: Merge tag 'char-misc-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.5-rc7~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5f351f0637777d01465e43c4426096905fe0ca21;p=~emulex%2Finfiniband.git

Merge tag 'char-misc-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull misc fix from Greg Kroah-Hartman:
 "Here's a single MEI driver fix that resolves a regression from 3.4
  that a number of people have reported (and sent to me in different
  patches.)

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'char-misc-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  mei: pci_resume: set IRQF_ONESHOT for msi request_threaded_irq
---

5f351f0637777d01465e43c4426096905fe0ca21