commit | 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Oct 09 09:02:35 2017 +0200 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Oct 09 09:02:35 2017 +0200 |
tree | 47da3feee8e263e8c9352c85cf518e624be3c211 | |
parent | 750b1a6894ecc9b178c6e3d0a1170122971b2036 [diff] | |
parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f [diff] |
Merge 4.14-rc4 into staging-next We want the staging/iio fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>