From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 15 Jun 2013 05:15:36 +0000 (-1000)
Subject: Merge tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9bb92855e3491e3f84a1477f14810f7c59fdbc73;p=linux-beck.git

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

Pull char / misc fixes from Greg Kroah-Hartman:
 "Here are some small mei driver fixes for 3.10-rc6 that fix some
  reported problems"

* tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  mei: me: clear interrupts on the resume path
  mei: nfc: fix nfc device freeing
  mei: init: Flush scheduled work before resetting the device
---

9bb92855e3491e3f84a1477f14810f7c59fdbc73