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

Pull char/misc fixes from Greg KH:
 "Here are a few small char/misc driver fixes for 4.10-rc3.

  Two MEI driver fixes, and three NVMEM patches for reported issues, and
  a new Hyper-V driver MAINTAINER update. Nothing major at all, all have
  been in linux-next with no reported issues"

* tag 'char-misc-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  hyper-v: Add myself as additional MAINTAINER
  nvmem: fix nvmem_cell_read() return type doc
  nvmem: imx-ocotp: Fix wrong register size
  nvmem: qfprom: Allow single byte accesses for read/write
  mei: move write cb to completion on credentials failures
  mei: bus: fix mei_cldev_enable KDoc

diff --combined MAINTAINERS
index c0441ab2f8b00f5b3703f8eba728411f35b79f50,fd394aece553121c469d4bd90d5c225cad67a526..5f0420a0da5b674b314718fa5393201aa61815b7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3800,7 -3800,6 +3800,7 @@@ F:      include/linux/devcoredump.
  DEVICE FREQUENCY (DEVFREQ)
  M:    MyungJoo Ham <[email protected]>
  M:    Kyungmin Park <[email protected]>
 +R:    Chanwoo Choi <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:    Maintained
@@@ -5081,11 -5080,9 +5081,11 @@@ F:    drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 +M:    Bartlomiej Zolnierkiewicz <[email protected]>
  L:    [email protected]
 +T:    git git://github.com/bzolnier/linux.git
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/fb/
  F:    drivers/video/
  F:    include/video/
@@@ -5507,7 -5504,6 +5507,7 @@@ M:      Alex Elder <[email protected]
  M:    Greg Kroah-Hartman <[email protected]>
  S:    Maintained
  F:    drivers/staging/greybus/
 +L:    [email protected]
  
  GREYBUS AUDIO PROTOCOLS DRIVERS
  M:    Vaibhav Agarwal <[email protected]>
@@@ -5965,6 -5961,7 +5965,7 @@@ F:      drivers/media/platform/sti/hv
  Hyper-V CORE AND DRIVERS
  M:    "K. Y. Srinivasan" <[email protected]>
  M:    Haiyang Zhang <[email protected]>
+ M:    Stephen Hemminger <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/x86/include/asm/mshyperv.h
@@@ -8856,22 -8853,17 +8857,22 @@@ F:   drivers/video/fbdev/nvidia
  NVM EXPRESS DRIVER
  M:    Keith Busch <[email protected]>
  M:    Jens Axboe <[email protected]>
 +M:    Christoph Hellwig <[email protected]>
 +M:    Sagi Grimberg <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
 -W:    https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
 +T:    git://git.infradead.org/nvme.git
 +W:    http://git.infradead.org/nvme.git
  S:    Supported
  F:    drivers/nvme/host/
  F:    include/linux/nvme.h
 +F:    include/uapi/linux/nvme_ioctl.h
  
  NVM EXPRESS TARGET DRIVER
  M:    Christoph Hellwig <[email protected]>
  M:    Sagi Grimberg <[email protected]>
  L:    [email protected]
 +T:    git://git.infradead.org/nvme.git
 +W:    http://git.infradead.org/nvme.git
  S:    Supported
  F:    drivers/nvme/target/
  
@@@ -9851,7 -9843,7 +9852,7 @@@ M:      Mark Rutland <[email protected]
  M:    Lorenzo Pieralisi <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/firmware/psci.c
 +F:    drivers/firmware/psci*.c
  F:    include/linux/psci.h
  F:    include/uapi/linux/psci.h
  
@@@ -13536,11 -13528,11 +13537,11 @@@ F:        arch/x86/xen/*swiotlb
  F:    drivers/xen/*swiotlb*
  
  XFS FILESYSTEM
 -M:    Dave Chinner <david@fromorbit.com>
 +M:    Darrick J. Wong <darrick.wong@oracle.com>
  M:    [email protected]
  L:    [email protected]
  W:    http://xfs.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
 +T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/