Merge tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

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"

diff --combined MAINTAINERS
index e36d18d8f0eba649ff8bdca3dee57535afecd92e,8baf56df3d84d89751afd4e7c301dfdc61f36a66..eb47dfb6390ab8c559566ef0494c6f0482b80050
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -7948,7 -7948,6 +7948,7 @@@ F:      drivers/mmc/host/sdhci-spear.
  
  SECURITY SUBSYSTEM
  M:    James Morris <james.l.morris@oracle.com>
 +M:    Serge E. Hallyn <serge@hallyn.com>
  L:    linux-security-module@vger.kernel.org (suggested Cc:)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
  W:    http://kernsec.org/
@@@ -9744,6 -9743,14 +9744,14 @@@ L:    virtualization@lists.linux-foundatio
  S:    Supported
  F:    arch/x86/kernel/cpu/vmware.c
  
+ VMWARE BALLOON DRIVER
+ M:    Xavier Deguillard <xdeguillard@vmware.com>
+ M:    Philip Moltmann <moltmann@vmware.com>
+ M:    "VMware, Inc." <pv-drivers@vmware.com>
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ F:    drivers/misc/vmw_balloon.c
+ 
  VMWARE VMXNET3 ETHERNET DRIVER
  M:    Shreyas Bhatewara <sbhatewara@vmware.com>
  M:    "VMware, Inc." <pv-drivers@vmware.com>