Merge 4.0-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Apr 2015 09:03:02 +0000 (11:03 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 7 Apr 2015 09:03:02 +0000 (11:03 +0200)
We want those fixes (iio primarily) into the -next branch to help with
merge and testing issues.

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

Trivial merge