From: Greg Kroah-Hartman Date: Sat, 10 Dec 2011 03:01:27 +0000 (-0800) Subject: Merge 3.2-rc5 into staging-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=407f3fd8faf80f77c47ebda7501c6a8698d2f3a6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 --- 407f3fd8faf80f77c47ebda7501c6a8698d2f3a6