Merge 4.11-rc6 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Apr 2017 13:21:55 +0000 (15:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Apr 2017 13:21:55 +0000 (15:21 +0200)
commitf78a8236c6502760705399dfa42e22ab11aa1e6b
treed965f09daff0d531c63e35c764e7061f9c43afe7
parent6cb3d05f3030deed157c9bbada5c58e7ee0f5172
parent39da7c509acff13fc8cb12ec1bb20337c988ed36
Merge 4.11-rc6 into staging-next

We want the staging and iio fixes in here to handle merging easier.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
.mailmap
MAINTAINERS
drivers/iio/common/cros_ec_sensors/cros_ec_sensors.c
drivers/iio/common/hid-sensors/hid-sensor-attributes.c