| commit | 5f47992491ffe2d5b2b4ea3556bc0f3c0ec9bc8b | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Apr 11 09:30:50 2016 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Apr 11 09:30:50 2016 -0700 |
| tree | f43f81ab67d152c148bd3dfc1a0683d2c8306014 | |
| parent | 148e45dc87cb76ba89e80da264bc692cc91a5149 [diff] | |
| parent | bf16200689118d19de1b8d2a3c314fc21f5dc7bb [diff] |
Merge 4.6-rc3 into staging-next This resolves a lot of merge issues with PAGE_CACHE_* changes, and an iio driver merge issue. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>