| commit | a769f30c7bd7cf917eea05a2b448f3588a87d767 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Feb 06 09:36:10 2017 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Feb 06 09:36:10 2017 +0100 |
| tree | 10a06089a9525926e23675528dd8190d05849143 | |
| parent | 307a082484eb0201ad123f39f95510a9da11985b [diff] | |
| parent | d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c [diff] |
Merge 4.10-rc7 into staging-next This resolves the merge errors that were reported in linux-next and it picks up the staging and IIO fixes that we need/want in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>