We want the staging/iio fixes in here as well to resolve issues and
merge problems.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>