From: Greg Kroah-Hartman Date: Tue, 20 Jun 2017 02:17:45 +0000 (+0800) Subject: Merge 4.12-rc6 into staging-next X-Git-Tag: v4.13-rc1~184^2~110 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d06838de4a015c7c4844ad3fcf63ad5e2c17b234;p=thirdparty%2Flinux.git Merge 4.12-rc6 into staging-next We want the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman --- d06838de4a015c7c4844ad3fcf63ad5e2c17b234