From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 27 Aug 2012 14:10:40 +0000 (-0700)
Subject: Merge 3.6-rc3 into staging-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f8b77bfdce811acbcf2248219a7aab5f92de938;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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>
---

8f8b77bfdce811acbcf2248219a7aab5f92de938
diff --cc drivers/staging/iio/adc/ad7192.c
index e381d4b5a6ed,095837285f4f..405d9a8d7b6d
--- a/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),