Merge 3.2-rc5 into staging-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 10 Dec 2011 03:01:27 +0000 (19:01 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 10 Dec 2011 03:01:27 +0000 (19:01 -0800)
commit407f3fd8faf80f77c47ebda7501c6a8698d2f3a6
tree3b41623f7174f1bee5b31853d2b295028cf9e376
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50
parent1d06825b0ede541f63b5577435abd2fc649a9b5e
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>
MAINTAINERS
drivers/staging/comedi/comedi_fops.c
drivers/staging/comedi/drivers/usbduxsigma.c
drivers/staging/iio/industrialio-core.c