From: Greg Kroah-Hartman Date: Mon, 5 Apr 2021 06:56:10 +0000 (+0200) Subject: Merge 5.12-rc6 into usb-next X-Git-Tag: v5.13-rc1~171^2~112 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de800f290dfaa341f22acac22bc454ea2bbf8f71;p=thirdparty%2Fkernel%2Flinux.git Merge 5.12-rc6 into usb-next We want the USB fixes in here as well and it resolves a merge issue with xhci-mtk.c Signed-off-by: Greg Kroah-Hartman --- de800f290dfaa341f22acac22bc454ea2bbf8f71