From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 9 Oct 2017 07:02:35 +0000 (+0200)
Subject: Merge 4.14-rc4 into staging-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee;p=linux.git

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>
---

1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee