Merge 4.14-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Oct 2017 12:29:43 +0000 (14:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Oct 2017 12:29:43 +0000 (14:29 +0200)
We want the IIO and staging driver fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/iio/adc/Kconfig
drivers/iio/adc/at91-sama5d2_adc.c
drivers/iio/pressure/zpa2326.c
drivers/iio/proximity/as3935.c
drivers/staging/iio/meter/ade7759.c
drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge