review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f240986 f8788d8)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 24 Feb 2020 07:37:48 +0000 (08:37 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 24 Feb 2020 07:37:48 +0000 (08:37 +0100)
commit	c85f15519d45588ce6ab8ad18616d2c0175a25d6
tree	4b27357fa550be86fde495ea9c9b2bdb54ebe1d7	tree \| snapshot
parent	f2409865c23ff83e08e07be8fa5d5d9b96f61487	commit \| diff
parent	f8788d86ab28f61f7b46eb6be375f8a726783636	commit \| diff

Merge 5.6-rc3 into staging-next

We need the staging fixes in here, and it resolves a merge issue in the
MAINTAINERS file.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;