Merge 4.17-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Apr 2018 12:12:05 +0000 (05:12 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Apr 2018 12:12:05 +0000 (05:12 -0700)
commit03420865e10d05d60d592fe8649e4853dc69ca5a
tree105d173e5267931d794e429ee7c64f83e526a521
parenta2e63709b53312002009c564460af34520c62f98
parent6da6c0db5316275015e8cc2959f12a17584aeb64
Merge 4.17-rc3 into staging-next

We want the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/staging/wilc1000/host_interface.c