| commit | e8cd29b774ddd28bfe6d693c82241e294dc91e09 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Dec 06 15:27:17 2017 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Wed Dec 06 15:27:17 2017 +0100 |
| tree | c8f904220eab7c50771558642b6c6d9240fb5368 | |
| parent | 7e739297cdbe8383bf4a5e423959107eccc01fa1 [diff] | |
| parent | 73996933b53ff396d63a7fccd8e824758634dc19 [diff] |
Merge Linus's staging merge point into staging-next This resolves the merge issue pointed out by Stephen in drivers/iio/adc/meson_saradc.c. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>