From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Jul 2015 02:50:59 +0000 (-0700)
Subject: Merge tag 'char-misc-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v4.14-rc1~4982
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e433b6560dd4e83a4241b702c2890bbf2eac64e7;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull char/misc driver fixes from Greg KH:
 "Here are some char and misc driver fixes for reported issues.

  One parport patch is reverted as it was incorrect, thanks to testing
  by the 0-day bot"

* tag 'char-misc-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  parport: Revert "parport: fix memory leak"
  mei: prevent unloading mei hw modules while the device is opened.
  misc: mic: scif bug fix for vmalloc_to_page crash
  parport: fix freeing freed memory
  parport: fix memory leak
  parport: fix error handling
---

e433b6560dd4e83a4241b702c2890bbf2eac64e7