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
..
afe440x.h	iio: health/afe440x: Use regmap fields	2016-05-04 11:10:38 +01:00
afe4403.c	iio: health: afe4403: retrieve a valid iio_dev in suspend/resume	2017-01-21 13:11:06 +00:00
afe4404.c	iio: health: afe4404: retrieve a valid iio_dev in suspend/resume	2017-01-21 13:12:41 +00:00
Kconfig	iio: health/afe4403: select REGMAP_SPI	2016-02-17 19:31:06 +00:00
Makefile	iio: health: Add driver for the TI AFE4403 heart monitor	2016-02-06 21:55:32 +00:00
max30100.c	Merge 4.10-rc7 into staging-next	2017-02-06 09:36:10 +01:00