OSDN Git Service

Merge 4.20-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Dec 2018 06:55:28 +0000 (07:55 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Dec 2018 06:55:28 +0000 (07:55 +0100)
commitd5d12ce229c17fde99c6f8cc42f3701264a60e8c
tree9d3c4ec71ea8cab74d02b8311997630d651767eb
parent7626e002225a4c1b9455689b1f22909dfeff43ca
parent2595646791c319cadfdbf271563aac97d0843dc7
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>
MAINTAINERS
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
drivers/staging/mt7621-dma/mtk-hsdma.c
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c