Merge 4.8-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Sep 2016 06:13:24 +0000 (08:13 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Sep 2016 06:13:24 +0000 (08:13 +0200)
commit9c2edd8b5bcb36ec6c890dd85f8fd13034aaa43e
tree052b3c229e00462cd0c5773c8b6b9fe314e86f38
parentaa652b1ccbd0d3a9cd4ecdec6d36935f78c838da
parentc6935931c1894ff857616ff8549b61236a19148f
Merge 4.8-rc5 into staging-next

We want the staging fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/accel/Kconfig
drivers/iio/adc/Kconfig
drivers/iio/chemical/atlas-ph-sensor.c
drivers/iio/humidity/Kconfig
drivers/iio/light/Kconfig
drivers/staging/comedi/drivers/dt2811.c
drivers/staging/lustre/lustre/llite/namei.c
drivers/staging/wilc1000/linux_wlan.c