| commit | 407f3fd8faf80f77c47ebda7501c6a8698d2f3a6 | |
| author | Greg Kroah-Hartman <gregkh@suse.de> | |
| Sat, 10 Dec 2011 03:01:27 +0000 (9 19:01 -0800) | ||
| committer | Greg Kroah-Hartman <gregkh@suse.de> | |
| Sat, 10 Dec 2011 03:01:27 +0000 (9 19:01 -0800) | ||
| tree | 3b41623f7174f1bee5b31853d2b295028cf9e376 | treesnapshot (tar.gz zip) |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 | commitdiff |
| parent | 1d06825b0ede541f63b5577435abd2fc649a9b5e | commitdiff |
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>
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>