summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-05-17 21:36:28 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-05-17 21:36:28 +0200
commitf4258b6bc82dd1a6ca79d915f4ae9b8b11998eaf (patch)
tree489f5d57a59717116fde99bda31d36a49b79e657 /kernel.spec
parentd62dbb4b5cb102030330390d409f50d7810ec192 (diff)
parent7101de41f1d6eb8862822213316d9f0edd2b4078 (diff)
downloadkernel-f4258b6bc82dd1a6ca79d915f4ae9b8b11998eaf.tar.gz
kernel-f4258b6bc82dd1a6ca79d915f4ae9b8b11998eaf.tar.xz
kernel-f4258b6bc82dd1a6ca79d915f4ae9b8b11998eaf.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 68b834e88..1e0d461ef 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -564,11 +564,13 @@ Patch303: ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
Patch304: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
# https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
-Patch306: arm-sdhci-esdhc-imx-fixes.patch
+Patch305: arm-sdhci-esdhc-imx-fixes.patch
-Patch312: arm64-rock960-enable-tsadc.patch
+Patch306: arm64-rock960-enable-tsadc.patch
-Patch339: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
+Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
+
+Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch
# Tegra bits
Patch340: arm64-tegra-jetson-tx1-fixes.patch