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)
commitce0347c2b089eb6ad6c14ab628a0ba5eb42f1492
treeac46f6168ebf7d44e33903f35f699cda2ec21ace
parentabbdc56b17d662ae710bc0c30cf0d0e9da805fd4
parenta25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6
Merge 4.9-rc5 into staging-next

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>
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