From: Greg Kroah-Hartman Date: Mon, 6 Feb 2017 08:36:10 +0000 (+0100) Subject: Merge 4.10-rc7 into staging-next X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a769f30c7bd7cf917eea05a2b448f3588a87d767;p=linux.git 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 --- a769f30c7bd7cf917eea05a2b448f3588a87d767