Greg Kroah-Hartman 4096e645d8 Merge 4.6-rc7 into staging-next ...

This fixes some merge issues with some iio drivers that were found in
linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2016-05-09 13:20:04 +02:00

..

accel

Merge tag 'iio-for-4.7b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-testing

2016-04-26 15:07:23 -07:00

adc

Merge 4.6-rc7 into staging-next

2016-05-09 13:20:04 +02:00

amplifiers

Merge tag 'spi-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

2015-11-05 13:15:12 -08:00

buffer

iio: buffer-dmaengine: Use dmaengine_terminate_sync()

2016-02-09 21:05:17 +00:00

chemical

iio: convert to common i2c_check_functionality() return value

2016-02-27 17:17:43 +00:00

common

iio: st_sensors: support open drain mode

2016-04-19 19:58:13 +01:00

dac

iio: dac: Add support for the AD5592R/AD5593R ADCs/DACs

2016-04-10 14:29:06 +01:00

dummy

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

2015-12-26 17:03:33 -08:00

frequency

iio: frequency: ad9523: use unsigned int rather then bare unsigned

2016-04-17 10:31:03 +01:00

gyro

Merge tag 'iio-for-4.7b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-testing

2016-04-26 15:07:23 -07:00

health

iio: health: max30100: correct FIFO check condition

2016-03-28 10:09:58 +01:00

humidity

iio: humidity: Add triggered buffer support for AM2315

2016-04-24 10:00:20 +01:00

imu

iio: imu: mpu6050: Fix name/chip_id when using ACPI

2016-05-04 08:44:27 +01:00

light

Merge tag 'iio-for-4.7b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-testing

2016-04-26 15:07:23 -07:00

magnetometer

Merge 4.6-rc7 into staging-next

2016-05-09 13:20:04 +02:00

orientation

…

potentiometer

iio: potentiometer: add driver for Maxim Integrated DS1803

2016-04-10 12:34:09 +01:00

pressure

iio: pressure: bmp280: add ability to control oversampling rate

2016-04-25 19:05:29 +01:00

proximity

iio: convert to common i2c_check_functionality() return value

2016-02-27 17:17:43 +00:00

temperature

iio: convert to common i2c_check_functionality() return value

2016-02-27 17:17:43 +00:00

trigger

iio: trigger: Introduce IIO hrtimer based trigger

2015-12-03 18:19:27 +00:00

iio_core_trigger.h

…

iio_core.h

…

industrialio-buffer.c

iio: fix config watermark initial value

2016-03-28 11:00:38 +01:00

industrialio-configfs.c

iio:configfs: Introduce iio/configfs.h to provide a location for the configfs_subsystem

2015-12-05 16:25:30 +00:00

industrialio-core.c

iio:core: mounting matrix support

2016-04-23 22:13:05 +01:00

industrialio-event.c

…

industrialio-sw-trigger.c

iio: core: fix ptr_ret.cocci warnings

2016-01-20 17:09:18 -08:00

industrialio-trigger.c

…

industrialio-triggered-event.c

…

inkern.c

iio: core: Add devm_ APIs for iio_channel_{get,release}_all

2016-04-19 19:58:15 +01:00

Kconfig

iio: light: add MAX30100 oximeter driver support

2015-12-12 12:14:37 +00:00

Makefile

iio: light: add MAX30100 oximeter driver support

2015-12-12 12:14:37 +00:00