OSDN Git Service

Merge 4.18-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Jul 2018 08:13:15 +0000 (10:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Jul 2018 08:13:15 +0000 (10:13 +0200)
commitc88b94a9f43cecdeae4fa3d30cadd9a3f604372f
tree113aea97fed1f08e0b5c9603c43fe1e147b68474
parent38c6aa2175c35358d01c29266000d26c78af9e36
parentacb1872577b346bd15ab3a3f8dff780d6cca4b70
Merge 4.18-rc7 into staging-next

We want the staging changes in here for testing and merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/ks7010/ks_hostif.c
drivers/staging/rtl8188eu/core/rtw_recv.c
drivers/staging/rtl8188eu/core/rtw_security.c