Merge tag 'char-misc-3.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Jul 2012 18:29:59 +0000 (11:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 11 Jul 2012 18:29:59 +0000 (11:29 -0700)
commit5f351f0637777d01465e43c4426096905fe0ca21
treeaa981f7be1859579470cd4c66cf0a05707a2daea
parente6f0f4546a2027fc6bdb9223e5f3fde431587f5d
parent16a50b1270455a6d41f9f6d8f99a72cf9d76824a
Merge tag 'char-misc-3.5-rc6' of git://git./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