From: Greg Kroah-Hartman Date: Mon, 9 Oct 2017 07:02:35 +0000 (+0200) Subject: Merge 4.14-rc4 into staging-next X-Git-Tag: v4.15-rc1~142^2~168 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee;p=thirdparty%2Fkernel%2Flinux.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 --- 1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee