Merge tag 'char-misc-3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jun 2013 05:15:36 +0000 (19:15 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Jun 2013 05:15:36 +0000 (19:15 -1000)
commit9bb92855e3491e3f84a1477f14810f7c59fdbc73
treeeb61cb5115803cb5a758a6152b83cf96a2206f21
parent3ad2e318a24124c53cc6390b5bfbd7613d9c2145
parent42f132febff3b7b42c6c9dbfc151f29233be3132
Merge tag 'char-misc-3.10-rc5' of git://git./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