Greg Kroah-Hartman a769f30c7b Merge 4.10-rc7 into staging-next ... This resolves the merge errors that were reported in linux-next and it picks up the staging and IIO fixes that we need/want in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2017-02-06 09:36:10 +01:00
..
am2315.c	iio: humidity: am2315: set up buffer timestamps for non-zero values	2016-08-15 15:39:23 +01:00
dht11.c	iio: dht11: Use usleep_range instead of msleep for start signal	2017-01-22 13:35:40 +00:00
hdc100x.c	iio: humidity: hdc100x: add triggered buffer support for HDC100X	2016-10-23 19:34:25 +01:00
hts221_buffer.c	iio: humidity: remove duplicated include from hts221_buffer.c	2016-11-01 18:43:46 +00:00
hts221_core.c	iio: humidity: add support to hts221 rh/temp combo device	2016-10-23 19:34:09 +01:00
hts221_i2c.c	iio: humidity: Support acpi probe for hts211	2016-12-03 08:56:28 +00:00
hts221_spi.c	iio: humidity: add support to hts221 rh/temp combo device	2016-10-23 19:34:09 +01:00
hts221.h	iio: humidity: add support to hts221 rh/temp combo device	2016-10-23 19:34:09 +01:00
htu21.c	iio: Export I2C module alias information	2016-05-21 20:08:14 +01:00
Kconfig	iio: humidity: hdc100x: add triggered buffer support for HDC100X	2016-10-23 19:34:25 +01:00
Makefile	iio: humidity: add support to hts221 rh/temp combo device	2016-10-23 19:34:09 +01:00
si7005.c	iio: convert to common i2c_check_functionality() return value	2016-02-27 17:17:43 +00:00
si7020.c	iio: si7020: Add devicetree support and trivial bindings	2016-11-01 18:49:53 +00:00