tree d965f09daff0d531c63e35c764e7061f9c43afe7
parent 6cb3d05f3030deed157c9bbada5c58e7ee0f5172
parent 39da7c509acff13fc8cb12ec1bb20337c988ed36
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1491830515 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1491830515 +0200

Merge 4.11-rc6 into staging-next

We want the staging and iio fixes in here to handle merging easier.

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