From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 Jun 2014 16:43:19 +0000 (-1000)
Subject: Merge tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: MMI-PSA29.97-13-9~12026
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=60761c10904593f08e7a015718f26d2013b9b8f2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'char-misc-3.16-rc2' of git://git./linux/kernel/git/gregkh/char-misc

Pull char / misc driver fixes from Greg KH:
 "Here are 3 patches, one a revert of the UIO patch you objected to in
  3.16-rc1 and that no one wanted to defend, a w1 driver bugfix, and a
  MAINTAINERS update for the vmware balloon driver.

  All of these, except for the MAINTAINERS update which just got added,
  have been in linux-next just fine"

* tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  MAINTAINERS: add entry for VMware Balloon driver
  w1: mxc_w1: Fix incorrect "presence" status
  Revert "uio: fix vma io range check in mmap"
---

60761c10904593f08e7a015718f26d2013b9b8f2