From: Greg Kroah-Hartman Date: Mon, 22 May 2017 06:56:55 +0000 (+0200) Subject: Merge 4.12-rc2 into char-misc-next X-Git-Tag: v4.13-rc1~181^2~134 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4a338d2b3cafa1be68d4e1903203c7e08a38ee5;p=thirdparty%2Flinux.git Merge 4.12-rc2 into char-misc-next We want the fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman --- b4a338d2b3cafa1be68d4e1903203c7e08a38ee5