Greg Kroah-Hartman e8cd29b774 Merge Linus's staging merge point into staging-next ... This resolves the merge issue pointed out by Stephen in drivers/iio/adc/meson_saradc.c. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2017-12-06 15:27:17 +01:00
..
accel	iio: accel: bmc150: Add OF device ID table	2017-12-02 11:59:33 +00:00
adc	Merge Linus's staging merge point into staging-next	2017-12-06 15:27:17 +01:00
amplifiers	iio:amplifiers:ad8366 drop assign iio_info.driver_module and iio_trigger_ops.owner	2017-08-22 21:24:50 +01:00
buffer	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
chemical	iio: chemical: ccs811: Add support for data ready trigger	2017-09-24 12:34:36 +01:00
common	iio: cros_ec: Remove unused variables	2017-12-02 10:39:44 +00:00
counter	iio:stm32-lp-timer and ep93xx: drop assign iio_info.driver_module and iio_trigger_ops.owner	2017-09-26 09:38:57 +02:00
dac	Staging/IIO patches for 4.15-rc1	2017-11-13 20:53:28 -08:00
dummy	A couple of configfs cleanups:	2017-11-14 14:44:04 -08:00
frequency	iio:frequency: drop assign iio_info.driver_module	2017-08-22 21:28:20 +01:00
gyro	Staging/IIO patches for 4.15-rc1	2017-11-13 20:53:28 -08:00
health	Merge Linus's staging merge point into staging-next	2017-12-06 15:27:17 +01:00
humidity	Staging/IIO patches for 4.15-rc1	2017-11-13 20:53:28 -08:00
imu	iio: imu: inv_mpu6050: Remove duplicate NULL check	2017-12-02 10:40:11 +00:00
light	iio: light: add support for UVIS25 sensor	2017-12-02 10:41:25 +00:00
magnetometer	iio: magnetometer: ak8975: Add another ACPI ID	2017-12-02 10:40:02 +00:00
multiplexer	iio: multiplexer: add NULL check on devm_kzalloc() and devm_kmemdup() return values	2017-09-03 18:10:29 +01:00
orientation	iio:orientation: drop assign iio_info.driver_module	2017-08-22 21:33:36 +01:00
potentiometer	Staging/IIO patches for 4.15-rc1	2017-11-13 20:53:28 -08:00
potentiostat	iio:potentiostat:lmp91000 drop assign iio_info.driver_module and iio_trigger_ops.owner	2017-08-22 21:34:48 +01:00
pressure	Staging/IIO patches for 4.15-rc1	2017-11-13 20:53:28 -08:00
proximity	Merge Linus's staging merge point into staging-next	2017-12-06 15:27:17 +01:00
temperature	Staging/IIO patches for 4.15-rc1	2017-11-13 20:53:28 -08:00
trigger	A couple of configfs cleanups:	2017-11-14 14:44:04 -08:00
iio_core.h
iio_core_trigger.h
industrialio-buffer.c
industrialio-configfs.c	iio: make function argument and some structures const	2017-10-19 16:15:24 +02:00
industrialio-core.c	Merge Linus's staging merge point into staging-next	2017-12-06 15:27:17 +01:00
industrialio-event.c
industrialio-sw-device.c	iio: make function argument and some structures const	2017-10-19 16:15:24 +02:00
industrialio-sw-trigger.c	iio: make function argument and some structures const	2017-10-19 16:15:24 +02:00
industrialio-trigger.c	iio:trigger: Remove necessity to have a trig->ops structure.	2017-08-22 21:20:28 +01:00
industrialio-triggered-event.c
inkern.c
Kconfig
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00