git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 34bcfda 9d3cce1)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 16 Jul 2018 07:04:54 +0000 (09:04 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 16 Jul 2018 07:04:54 +0000 (09:04 +0200)
commit	83cf9cd6d50ed4f7e6ae265e80e38b235c792f5f
tree	6016c386c321cd6a3e8575e01ed9f10834fc5081	tree \| snapshot
parent	34bcfdac8c92cc7971254ba5856afd12047c50b2	commit \| diff
parent	9d3cce1e8b8561fed5f383d22a4d6949db4eadbe	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/x86/hyperv/hv_init.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/mshyperv.h	diff1 \|	diff2 \|	blob \| history
drivers/misc/mei/interrupt.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/vmw_balloon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/nvmem/core.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree