Merge 3.6-rc3 into staging-next

This picks up fixes we want in this branch to allow us to properly test.

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

diff --cc drivers/staging/comedi/drivers.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7192.c
index e381d4b5a6ed922c3d30ea1e685f1b82df77c948,095837285f4fb25732b8986f3d6d25458a9a11a2..405d9a8d7b6db1082cbba722997247509863c2f1
--- 1/drivers/staging/iio/adc/ad7192.c
--- 2/drivers/staging/iio/adc/ad7192.c
+++ b/drivers/staging/iio/adc/ad7192.c
@@@ -965,9 -969,9 +969,9 @@@ static const struct iio_info ad7195_inf
          IIO_CHAN_INFO_SCALE_SEPARATE_BIT,                             \
          .address = _address,                                          \
          .scan_index = _si,                                            \
-         .scan_type =  IIO_ST('s', 24, 32, 0)}
+         .scan_type =  IIO_ST('u', 24, 32, 0)}
  
 -static struct iio_chan_spec ad7192_channels[] = {
 +static const struct iio_chan_spec ad7192_channels[] = {
        AD7192_CHAN_DIFF(1, 2, NULL, AD7192_CH_AIN1P_AIN2M, 0),
        AD7192_CHAN_DIFF(3, 4, NULL, AD7192_CH_AIN3P_AIN4M, 1),
        AD7192_CHAN_TEMP(0, AD7192_CH_TEMP, 2),