tree 105d173e5267931d794e429ee7c64f83e526a521
parent a2e63709b53312002009c564460af34520c62f98
parent 6da6c0db5316275015e8cc2959f12a17584aeb64
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1525090325 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1525090325 -0700

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>