| commit | e2aad1d5716c5f7fa5deb4a96e6b6a4e9f24e78b | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Sep 25 08:59:04 2013 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Sep 25 08:59:04 2013 -0700 |
| tree | 389fbdf161a3c28c9b2f98fdc1ccd89d474ef884 | |
| parent | 3ffdea3feca9e2c95c2e93e217d77c9c368f747a [diff] | |
| parent | 4a10c2ac2f368583138b774ca41fac4207911983 [diff] |
Merge 3.12-rc2 into staging-next. This resolves the merge problem with two iio drivers that Stephen Rothwell pointed out. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>