]> git.baikalelectronics.ru Git - kernel.git/commit
Merge 5.1-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:49:24 +0000 (07:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 1 Apr 2019 05:49:24 +0000 (07:49 +0200)
commitbc534253a706257f3a58eca79cffbb8c27493567
tree5f7f711b8582d723e1f4c0bb658b7dcaba656ad4
parenta6808ffa3daad8b0c4d774b2839bd5195bff5fa8
parent93e08937bc58c51cee8c371b7593b2be4a6d736c
Merge 5.1-rc3 into staging-next

We want those fixes and this resolves an erofs merge conflict.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/ni_mio_common.c
drivers/staging/erofs/unzip_vle.c
drivers/staging/rtl8712/rtl8712_cmd.c
drivers/staging/rtl8712/rtl8712_cmd.h
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c