Merge 3.2-rc5 into staging-next

This resolves the conflict in the
drivers/staging/iio/industrialio-core.c file due to two different
changes made to resolve the same problem.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/staging/iio/industrialio-core.c
Simple merge