git.maquefel.me Git - linux.git/commit

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 28 Jan 2019 07:17:02 +0000 (08:17 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 28 Jan 2019 07:17:02 +0000 (08:17 +0100)
commit	d61b5d546af21e886aafcc9182f5ac5935a3177d
tree	448b389768a74efb604dd22ea2a5d43686ea3be5	tree \| snapshot
parent	94832d93992176b7c37672e1fc7b7acc16e70286	commit \| diff
parent	f17b5f06cb92ef2250513a1e154c47b78df07d40	commit \| diff

Merge 5.0-rc4 into staging-next

We need the staging fixes in here as well.

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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/ion.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/rtl8188eu/os_dep/usb_intf.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wilc1000/host_interface.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/wilc1000/wilc_wlan.c	diff1 \|	diff2 \|	blob \| history