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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c2e5df6 33d930e)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 16 Oct 2017 07:22:22 +0000 (09:22 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 16 Oct 2017 07:22:22 +0000 (09:22 +0200)
commit	58f2c391cc0560231d7636c39d31b1b26c9396b7
tree	67956eea736a8763f67be8a52bcaf0d3fe4374f4	tree \| snapshot
parent	c2e5df616e1ae6c2a074cb241ebb65a318ebaf7c	commit \| diff
parent	33d930e59a98fa10a0db9f56c7fa2f21a4aef9b9	commit \| diff

Merge 4.14-rc5 into char-misc-next

We need the fixes in here to resolve merge issues and for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/hv/channel_mgmt.c	diff1 \|	diff2 \|	blob \| history
drivers/hv/vmbus_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/nvmem/core.c	diff1 \|	diff2 \|	blob \| history
include/linux/hyperv.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree