From: Olof Johansson Date: Thu, 24 Jun 2021 01:44:45 +0000 (-0700) Subject: Merge tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: v5.14-rc1~23^2^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d6fe39ac6cc596d50ff031acdf69434fad64049;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes Fix duplicate usb4 regression for dra74 variants USB4 is only present in DRA74x variants, and I managed to add it for the other variants too with the recent legacy platform data removal. * tag 'omap-for-v5.13/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: dra7: Fix duplicate USB4 target module node Link: https://lore.kernel.org/r/pull-1623999845-180025@atomide.com Signed-off-by: Olof Johansson --- 3d6fe39ac6cc596d50ff031acdf69434fad64049