From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 13 Jul 2014 22:47:26 +0000 (-0700)
Subject: Merge tag 'iio-fixes-for-3.16d' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.16-rc6~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9359003385a2faffa502d201771d45624037a4cd;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'iio-fixes-for-3.16d' of git://git./linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

4th set of fixes for IIO in the 3.16 cycle

* Fix incorrect handling of the iio_event_spec mask_shared_by_type
  bitmap. The point of this was to allow multiple channels to specify
  elements that lead to the same sysfs attribute.  A but in the handling
  meant that this failed.  The handling is modified to be similar to that
  used for the main IIO info_mask_shared_by_type which works correclty.
* The acceleration scale factors reported by the mma8452 driver gave
  accelerations in g, wherease the IIO ABI is in m/s^2. The fix simply
  corrects the reported scale factors.
---

9359003385a2faffa502d201771d45624037a4cd