tree ff262847ff4f6797c9df882379ea0498a8822a18
parent b9920ca3b53728aaa836f138f74ebb37776b9f57
parent cc4a41fe5541a73019a864883297bd5043aa6d98
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1503926808 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1503926808 +0200

Merge 4.13-rc7 into staging-next

We want the staging and iio fixes in here to handle the merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>