summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-06-25 16:21:24 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-06-25 16:21:24 +0200
commitdf42165883bcc2dabe8abeafd432c3fb2a00dce5 (patch)
tree5e4e2b34dbd12ba55784d93d463898b6ea1cdea8 /kernel.spec
parent828558c64800d913589a096c1abde7707e7e686c (diff)
parentaa0fcf841b810eb9e7e5ac180f64ae0ed6d8e0bc (diff)
downloadkernel-df42165883bcc2dabe8abeafd432c3fb2a00dce5.tar.gz
kernel-df42165883bcc2dabe8abeafd432c3fb2a00dce5.tar.xz
kernel-df42165883bcc2dabe8abeafd432c3fb2a00dce5.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 4cbfaba84..5aefd330d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -575,6 +575,8 @@ Patch330: ARM-cpufreq-support-for-Raspberry-Pi.patch
Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch
+Patch332: bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
+
# Tegra bits
Patch340: arm64-tegra-jetson-tx1-fixes.patch