]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf5387cf5530fe7b175209015af5d3c4aabde80ce
treeaf626c941574ea68f7d74da04d81e302fbc14a68
parentf91deae643536993f985e6c4d7a75b2bdfc21b3a
parentb952db094f6189476b97fccaee073915d3359a25
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