Merge 4.16-rc3 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Feb 2018 14:32:00 +0000 (15:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Feb 2018 14:32:00 +0000 (15:32 +0100)
commit36e9f7203e05090031a5356be043a9be342e383c
tree27877737c3bb3c00ee9caeece7d671f65cf91252
parent721dfe4133a9a41e4b4a74e5b41089b7dac8f539
parent4a3928c6f8a53fa1aed28ccba227742486e8ddcb
Merge 4.16-rc3 into staging-next

We want the IIO/Staging fixes in here, and to resolve a merge problem
with the move of the fsl-mc code.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c
drivers/staging/iio/adc/ad7192.c