tree 5e923d12b6284a711d66efee822ca48f95ebf1af
parent b0fe8f7b9b5adea2c85c72bba46e20fb21522769
parent c02ed2e75ef4c74e41e421acb4ef1494671585e8
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1490598685 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1490598685 +0200

Merge 4.11-rc4 into staging-next

We need the IIO fixes in here as well to handle merge issues.

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