OSDN Git Service

Merge 4.19-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Sep 2018 20:04:13 +0000 (22:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Sep 2018 20:04:13 +0000 (22:04 +0200)
commit7dc074348eb85d48f7a1fa96879458f4becf68a7
treeaf626c941574ea68f7d74da04d81e302fbc14a68
parent6029b7ac292abd36f8dff7f75e83dfd01332b265
parent7876320f88802b22d4e2daf7eb027dd14175a0f8
Merge 4.19-rc4 into staging-next

Handle the merge issues and take the iio and staging driver fixes.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
drivers/staging/erofs/super.c
drivers/staging/wilc1000/linux_wlan.c
drivers/staging/wilc1000/wilc_wlan.c