-
Greg Kroah-Hartman authored
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>
407f3fd8
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>