| commit | 407f3fd8faf80f77c47ebda7501c6a8698d2f3a6 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Fri Dec 09 19:01:27 2011 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Fri Dec 09 19:01:27 2011 -0800 |
| tree | 3b41623f7174f1bee5b31853d2b295028cf9e376 | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 [diff] | |
| parent | 1d06825b0ede541f63b5577435abd2fc649a9b5e [diff] |
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>