OSDN Git Service

Merge 4.18-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2018 07:04:54 +0000 (09:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2018 07:04:54 +0000 (09:04 +0200)
commit83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f
tree6016c386c321cd6a3e8575e01ed9f10834fc5081
parent34bcfdac8c92cc7971254ba5856afd12047c50b2
parent9d3cce1e8b8561fed5f383d22a4d6949db4eadbe
Merge 4.18-rc5 into char-misc-next

We want the char-misc fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
arch/x86/hyperv/hv_init.c
arch/x86/include/asm/mshyperv.h
drivers/misc/mei/interrupt.c
drivers/misc/vmw_balloon.c
drivers/net/hyperv/netvsc_drv.c
drivers/nvmem/core.c