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

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 3 Dec 2018 06:55:28 +0000 (07:55 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 3 Dec 2018 06:55:28 +0000 (07:55 +0100)
commit	d5d12ce229c17fde99c6f8cc42f3701264a60e8c
tree	9d3c4ec71ea8cab74d02b8311997630d651767eb	tree \| snapshot
parent	7626e002225a4c1b9455689b1f22909dfeff43ca	commit \| diff
parent	2595646791c319cadfdbf271563aac97d0843dc7	commit \| diff

Merge 4.20-rc5 into staging-next

We need the staging fixes in here as well.

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

John Crispins staging tree

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/mt7621-dma/mtk-hsdma.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c	diff1 \|	diff2 \|	blob \| history