tree 6991a32acd3d63685c184734869877707fa73d1c
parent f9541f8239a5765595543b021b2dce6a8d6653ab
parent f22e6e847115abc3a0e2ad7bb18d243d42275af1
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1428397382 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1428397382 +0200

Merge 4.0-rc7 into staging-next

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>