From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 26 Apr 2014 15:12:25 +0000 (-0700)
Subject: Merge tag 'iio-for-3.16a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9870^2~39^2~1228
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d5cef008e95ffdaf457e38254e67d145a927df96;p=mirror_ubuntu-artful-kernel.git

Merge tag 'iio-for-3.16a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

First round of IIO new driver, functionality and cleanups for the 3.16 cycle.

New device support
* AS3935 Lightning Sensor
* MCP3426/7/8 support added to the existing MCP3422 ADC driver
* AK8963 support in the AK8975 driver
* MPU6500 support in the MPU6050 driver (the functionality that is different
  is mostly not supported yet in either part).

Staging Graduations
* AD799x ADC

New functionality
* ACPI enumeration for the ak8975 driver

Cleanup / tweaks
* Use snprintf as a matter of good practice in a few additional places.
* Document *_mean_raw attributes.  These have been there a while, but were
  undocumented.
* Add an in kernel interface to get the mean values.
* Bug in the length of the event info mask that by coincidence wasn't yet
  actually causing any problems.
* itg3000 drop an unreachable return statement.
* spear_adc cleanups (heading for a staging graduation but a few more
  issues showed up in the review of these patches).
* Exynos ADC dependencies changed so it is only built when Exynos is present
  or COMPILE_TEST and OF are set.
* tsl2583 cleanups.
* Some cut and paste typos in the comments of various drivers still in staging.
* Couple of minor improvements to the ST sensor drivers.
---

d5cef008e95ffdaf457e38254e67d145a927df96
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index abc308083acb,2025cee4b6b2..7e88bc619565
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -12,7 -11,7 +12,8 @@@ ak	Asahi Kasei Corp
  allwinner	Allwinner Technology Co., Ltd.
  altr	Altera Corp.
  amcc	Applied Micro Circuits Corporation (APM, formally AMCC)
 +amd	Advanced Micro Devices (AMD), Inc.
+ ams	AMS AG
  amstaos	AMS-Taos Inc.
  apm	Applied Micro Circuits Corporation (APM)
  arm	ARM Ltd.