Merge 4.9-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Nov 2016 07:53:56 +0000 (08:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Nov 2016 07:53:56 +0000 (08:53 +0100)
We want the staging/iio fixes in here as well to resolve issues and
merge problems.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
MAINTAINERS
drivers/iio/accel/st_accel_core.c
drivers/iio/common/hid-sensors/hid-sensor-attributes.c
drivers/staging/comedi/drivers/ni_tio.c
drivers/staging/greybus/arche-platform.c
drivers/staging/media/bcm2048/radio-bcm2048.c

diff --cc MAINTAINERS
Simple merge
Simple merge