Merge 3.12-rc6 into staging-next.

We want these fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/frequency/adf4350.c
Simple merge

diff --cc drivers/iio/industrialio-buffer.c
index d7ab258e3a427692e9c073a34a55a933123b295b,2db7dcd826b9db6500e354498b385cbb3ebd9f7d..7f9152c3c4d3dafa61f2cac1126b1cbd50306a6e
--- 1/drivers/iio/industrialio-buffer.c
--- 2/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@@ -490,23 -477,12 +490,26 @@@ void iio_disable_all_buffers(struct iio
        indio_dev->currentmode = INDIO_DIRECT_MODE;
        if (indio_dev->setup_ops->postdisable)
                indio_dev->setup_ops->postdisable(indio_dev);
+ 
+       if (indio_dev->available_scan_masks == NULL)
+               kfree(indio_dev->active_scan_mask);
  }
  
 -int iio_update_buffers(struct iio_dev *indio_dev,
 +static void iio_buffer_update_bytes_per_datum(struct iio_dev *indio_dev,
 +      struct iio_buffer *buffer)
 +{
 +      unsigned int bytes;
 +
 +      if (!buffer->access->set_bytes_per_datum)
 +              return;
 +
 +      bytes = iio_compute_scan_bytes(indio_dev, buffer->scan_mask,
 +              buffer->scan_timestamp);
 +
 +      buffer->access->set_bytes_per_datum(buffer, bytes);
 +}
 +
 +static int __iio_update_buffers(struct iio_dev *indio_dev,
                       struct iio_buffer *insert_buffer,
                       struct iio_buffer *remove_buffer)
  {