summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-09-26 18:39:00 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-09-26 18:39:00 +0200
commit7c8e030e79d5d4400546b159515cd13af65a3e73 (patch)
tree91fbd61128182000a9e3c4177579765f00ed67dc /kernel.spec
parent24be51bba942bfefdbabf92075ced13a160ce310 (diff)
parentbad683795e8c5404728f8abc1aeb031da6260c00 (diff)
downloadkernel-7c8e030e79d5d4400546b159515cd13af65a3e73.tar.gz
kernel-7c8e030e79d5d4400546b159515cd13af65a3e73.tar.xz
kernel-7c8e030e79d5d4400546b159515cd13af65a3e73.zip
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index cefe80024..d87384f4e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -883,6 +883,9 @@ Patch103: arm64-tegra-Use-valid-PWM-period-for-VDD_GPU-on-Tegra210.patch
# Goes away with 5.9
Patch105: 0001-platform-x86-thinkpad_acpi-lap-or-desk-mode-interfac.patch
+# https://patchwork.kernel.org/patch/11796255/
+Patch106: arm64-dts-rockchip-disable-USB-type-c-DisplayPort.patch
+
# https://bugzilla.redhat.com/show_bug.cgi?id=1874117
Patch107: 0001-drivers-perf-xgene_pmu-Fix-uninitialized-resource-st.patch