Merge 4.11-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Mar 2017 07:11:25 +0000 (09:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Mar 2017 07:11:25 +0000 (09:11 +0200)
commit1c816bad41fea5470e8077ae4e661f3f9b5ada64
tree5e923d12b6284a711d66efee822ca48f95ebf1af
parentb0fe8f7b9b5adea2c85c72bba46e20fb21522769
parentc02ed2e75ef4c74e41e421acb4ef1494671585e8
Merge 4.11-rc4 into staging-next

We need the IIO fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
drivers/staging/vc04_services/Kconfig