From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 27 Oct 2013 21:02:54 +0000 (-0700)
Subject: Merge tag 'iio-for-3.13e' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23... 
X-Git-Tag: v3.13-rc1~170^2~91
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9908b4f32f91aafa86239dd092e9e5540e8615e0;p=kernel%2Fkernel-generic.git

Merge tag 'iio-for-3.13e' of git://git./linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

Fifth round of IIO new drivers, cleanups and functionality for the 3.13 cycle.

New Driver
* Freescale mag3110 magnetometer driver.

New functionality
* Add LPS001WP support to the ST pressure driver.
* Allow the max1363 driver to use only smbus functions for 8 bit devices. This
  allows the driver to be used when more extensive i2c support is not
  available.

Cleanups
* Fix incorrect description of unit conversions in ak8975.
* Switch to pr_err in industrialio-core.c instead of direct printk calls.
* Some simple redundant error handling removal patches.
* Trivial warning suppression by adding brackets to a sizeof call.
* Drop redundant of_match_ptr casts in drivers that are dependent on
  OF supporting being present.  The only purpose of the of_match_ptr
  wrapper was to make stubbing out of the relevant structures trivial.

Fixes
* Make MXS_LRADC depend on INPUT to avoid compile failures. This fixes an
  issue introduced in the previous pull in this cycle.
---

9908b4f32f91aafa86239dd092e9e5540e8615e0