Merge 3.2-rc5 into staging-next
Greg Kroah-Hartman [Sat, 10 Dec 2011 03:01:27 +0000 (19:01 -0800)]
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>

1  2 
MAINTAINERS
drivers/staging/comedi/comedi_fops.c
drivers/staging/comedi/drivers/usbduxsigma.c
drivers/staging/iio/industrialio-core.c

diff --cc MAINTAINERS
Simple merge
Simple merge