Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	Documentation/driver-model/devres.txt

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/light/adjd_s311.c
Simple merge

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/comedi/comedidev.h
Simple merge

diff --cc drivers/staging/imx-drm/imx-drm-core.c
Simple merge