1
0
Fork 0
alistair23-linux/Documentation/devicetree/bindings/iio
Linus Torvalds c6a677c6f3 Staging/IIO patches for 4.12-rc1
Here is the big staging tree update for 4.12-rc1.  And it's a big one,
 adding about 350k new lines of crap^Wcode, mostly all in a big dump of
 media drivers from Intel.  But there's other new drivers in here as
 well, yet-another-wifi driver, new IIO drivers, and a new crypto
 accelerator.  We also deleted a bunch of stuff, mostly in patch
 cleanups, but also the Android ION code has shrunk a lot, and the
 Android low memory killer driver was finally deleted, much to the
 celebration of the -mm developers.
 
 All of these have been in linux-next with a few build issues that will
 show up when you merge to your tree, I'll follow up with fixes for those
 after this gets merged.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 
 iG0EABECAC0WIQT0tgzFv3jCIUoxPcsxR9QN2y37KQUCWQzzlQ8cZ3JlZ0Brcm9h
 aC5jb20ACgkQMUfUDdst+ylNMgCcD+GoaF/Ml7YnULRl2GG/526II78AnitZ8qjd
 rPqeowMIewYu9fgckLUc
 =7rzO
 -----END PGP SIGNATURE-----

Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging/IIO updates from Greg KH:
 "Here is the big staging tree update for 4.12-rc1.

  It's a big one, adding about 350k new lines of crap^Wcode, mostly all
  in a big dump of media drivers from Intel. But there's other new
  drivers in here as well, yet-another-wifi driver, new IIO drivers, and
  a new crypto accelerator.

  We also deleted a bunch of stuff, mostly in patch cleanups, but also
  the Android ION code has shrunk a lot, and the Android low memory
  killer driver was finally deleted, much to the celebration of the -mm
  developers.

  All of these have been in linux-next with a few build issues that will
  show up when you merge to your tree"

Merge conflicts in the new rtl8723bs driver (due to the wifi changes
this merge window) handled as per linux-next, courtesy of Stephen
Rothwell.

* tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1182 commits)
  staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd
  staging: ks7010: remove line continuations in quoted strings
  staging: vt6656: use tabs instead of spaces
  staging: android: ion: Fix unnecessary initialization of static variable
  staging: media: atomisp: fix range checking on clk_num
  staging: media: atomisp: fix misspelled word in comment
  staging: media: atomisp: kmap() can't fail
  staging: atomisp: remove #ifdef for runtime PM functions
  staging: atomisp: satm include directory is gone
  atomisp: remove some more unused files
  atomisp: remove hmm_load/store/clear indirections
  atomisp: kill off mmgr_free
  atomisp: clean up the hmm init/cleanup indirections
  atomisp: handle allocation calls before init in the hmm layer
  staging: fsl-dpaa2/eth: Add maintainer for Ethernet driver
  staging: fsl-dpaa2/eth: Add TODO file
  staging: fsl-dpaa2/eth: Add trace points
  staging: fsl-dpaa2/eth: Add driver specific stats
  staging: fsl-dpaa2/eth: Add ethtool support
  staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver
  ...
2017-05-05 18:16:23 -07:00
..
accel dt-bindings: iio: accel: Document ADXL345 accelerometer binding 2017-03-04 16:39:07 +00:00
adc Staging/IIO patches for 4.12-rc1 2017-05-05 18:16:23 -07:00
chemical iio: chemical: atlas-ph-sensor: add ORP feature 2016-08-21 11:59:53 +01:00
dac dt-bindings: iio: stm32-dac: Add support for STM32 DAC 2017-04-14 16:35:44 +01:00
frequency iio: frequency: adf4350: Add support for dt bindings 2013-06-09 19:15:43 +01:00
gyroscope iio: gyro: Add MPU-3050 device tree bindings 2016-10-25 16:54:35 +01:00
health devicetree: add documentation for MAX30102 oximeter 2017-02-05 09:44:57 +00:00
humidity Documentation: dt: iio: humidity: add hts221 sensor device binding 2016-10-23 19:34:09 +01:00
imu iio:imu:mpu6050 add explicit mpu9250 support 2017-04-02 10:12:08 +01:00
light iio:light: Add support for STMicro VL6180 sensor 2017-03-25 16:20:46 +00:00
magnetometer iio: magn: DT bindings for AK8974 2016-08-15 16:49:37 +01:00
potentiometer iio: max5481: Add support for Maxim digital potentiometers 2017-01-28 12:13:31 +00:00
potentiostat iio: potentiostat: add LMP91000 support 2016-09-27 20:33:03 +01:00
pressure iio:pressure: initial zpa2326 barometer support 2016-09-18 19:42:21 +01:00
proximity iio: distance: add dt binding for devantech-srf04 2017-02-04 12:17:41 +00:00
temperature Documentation: dt-bindings: tmp007: Add optional interrupt support 2017-01-28 11:51:58 +00:00
timer iio: Add bindings for STM32 timer trigger driver 2017-01-25 16:11:55 +00:00
iio-bindings.txt ARM: dts: Change iio_hwmon nodes to use hypen in node names 2016-03-05 06:25:34 -08:00
sensorhub.txt iio: sensorhub: Add sensorhub bindings 2015-01-29 18:49:08 +00:00
st-sensors.txt iio: accel: st_accel: handle deprecated bindings 2017-01-10 19:54:16 +00:00