Merge iio fixes into staging-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 2 Mar 2014 22:04:01 +0000 (14:04 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 2 Mar 2014 22:04:01 +0000 (14:04 -0800)
These I forgot about before, but need to get into 3.14-final.

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

Trivial merge