From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jun 2012 22:13:56 +0000 (-0700)
Subject: Merge tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: firefly_0821_release~3680^2~2580
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8;p=firefly-linux-kernel-4.4.55.git

Merge tag 'char-misc-3.5-rc4' of git://git./linux/kernel/git/gregkh/char-misc

Pull misc tree updates from Greg Kroah-Hartman:
 "Here are some drivers/misc bugfixes (really just drivers/misc/mei/
  fixes) for a few problems that have been reported.

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

* tag 'char-misc-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  misc: mei: set WDIOF_ALARMONLY on mei watchdog
  misc: mei: Disable MSI when IRQ registration fails
  misc: mei: fix stalled read
  misc: mei: unregister misc device in pci_remove function
  misc: mei: set IRQF_ONESHOT for msi request_threaded_irq
---

f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8