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

..

afe440x.h

…

afe4403.c

iio:health: drop assign iio_info.driver_module and iio_trigger_ops.owner

2017-08-22 21:29:44 +01:00

afe4404.c

iio:health: drop assign iio_info.driver_module and iio_trigger_ops.owner

2017-08-22 21:29:44 +01:00

Kconfig

…

Makefile

…

max30100.c

iio:health: drop assign iio_info.driver_module and iio_trigger_ops.owner

2017-08-22 21:29:44 +01:00

max30102.c

Merge Linus's staging merge point into staging-next

2017-12-06 15:27:17 +01:00