linux/drivers/iio/proximity
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
..
Kconfig iio: proximity: Add rfd77402 driver 2017-10-14 18:28:51 +01:00
Makefile Staging/IIO patches for 4.15-rc1 2017-11-13 20:53:28 -08:00
as3935.c Merge 4.14-rc6 into staging-next 2017-10-23 14:29:43 +02:00
pulsedlight-lidar-lite-v2.c iio:proximity: drop assign iio_info.driver_module and iio_trigger_ops.owner 2017-08-22 22:14:51 +01:00
rfd77402.c iio: proximity: Add rfd77402 driver 2017-10-14 18:28:51 +01:00
srf04.c iio:proximity: drop assign iio_info.driver_module and iio_trigger_ops.owner 2017-08-22 22:14:51 +01:00
srf08.c iio:proximity: drop assign iio_info.driver_module and iio_trigger_ops.owner 2017-08-22 22:14:51 +01:00
sx9500.c Merge Linus's staging merge point into staging-next 2017-12-06 15:27:17 +01:00