summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-12-16 06:02:14 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-12-16 06:02:14 +0100
commitbd4811b329a8db93304f303af2c6e4660a1c2b5c (patch)
tree14f6a8d14e4a11ded63f86114e1f49f4891ec1bd /kernel.spec
parent04994d2863f00474671a5212c08f89fbf8dc1162 (diff)
parent79730560f894138af71ceb6488cb818d9bbb39d7 (diff)
downloadkernel-bd4811b329a8db93304f303af2c6e4660a1c2b5c.tar.gz
kernel-bd4811b329a8db93304f303af2c6e4660a1c2b5c.tar.xz
kernel-bd4811b329a8db93304f303af2c6e4660a1c2b5c.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 3f350953b..9c4547b85 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -837,6 +837,8 @@ Patch304: ARM-tegra-usb-no-reset.patch
Patch310: Raspberry-Pi-4-PCIe-support.patch
# https://patchwork.kernel.org/patch/11223139/
Patch311: ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch
+# https://patchwork.kernel.org/patch/11292523/
+Patch312: ARM-bcm-Fix-support-for-BCM2711-SoC-which-breaks-other-ARM-platforms.patch
# Tegra bits
Patch320: arm64-tegra-jetson-tx1-fixes.patch