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

Pull char/misc driver fixes from Greg Kroah-Hartman:
 "Here are some small char/misc driver fixes for 3.10-rc2.

  Nothing major here, just a number of fixes for things that people have
  reported, and a MAINTAINERS update for the recent changes for the
  hyperv files that went into 3.10-rc1."

* tag 'char-misc-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port
  uio: UIO_DMEM_GENIRQ should depend on HAS_DMA
  MAINTAINERS: update Hyper-V file list
  mei: bus: Reset event_cb when disabling a device
  Drivers: hv: Fix a bug in get_vp_index()
  mei: fix out of array access to me clients array
  Char: lp, protect LPGETSTATUS with port_mutex
  dummy-irq: require the user to specify an IRQ number

1 files changed, 8 insertions, 1 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index dbf4880fdb08..94b5a60b19c5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3865,9 +3865,16 @@ M:	K. Y. Srinivasan <kys@microsoft.com>
 M:      Haiyang Zhang <haiyangz@microsoft.com>
 L:      devel@linuxdriverproject.org
 S:      Maintained
-F:      drivers/hv/
+F:      arch/x86/include/asm/mshyperv.h
+F:      arch/x86/include/uapi/asm/hyperv.h
+F:      arch/x86/kernel/cpu/mshyperv.c
 F:      drivers/hid/hid-hyperv.c
+F:      drivers/hv/
 F:      drivers/net/hyperv/
+F:      drivers/scsi/storvsc_drv.c
+F:      drivers/video/hyperv_fb.c
+F:      include/linux/hyperv.h
+F:      tools/hv/
 
 I2C OVER PARALLEL PORT
 M:      Jean Delvare <khali@linux-fr.org>