Merge 4.9-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Oct 2016 10:38:44 +0000 (06:38 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Oct 2016 10:38:44 +0000 (06:38 -0400)
commitbdc065666a591fddc4e55cbdcd6c7b02f289b5ff
treeacb92182d7c28a8d5176feb99fd7fb110a693ab7
parent32774ef3e4bb339cec19655946996a8c50063be4
parenta909d3e636995ba7c349e2ca5dbb528154d4ac30
Merge 4.9-rc3 into staging-next

This resolves a merge issue with
drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in
here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/adc/Kconfig
drivers/staging/android/ion/ion.c
drivers/staging/greybus/arche-platform.c
drivers/staging/greybus/es2.c
drivers/staging/greybus/uart.c
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
drivers/staging/wilc1000/host_interface.c