Merge branch 'master' into i486

2 files changed, 4 insertions, 4 deletions

diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index ac33b0fa..9a5be0f9 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-pae           # Build stock -ARCH kernel
-pkgver=4.17.13
+pkgver=4.17.14
 _srcname=linux-${pkgver}
 pkgrel=1
 arch=('i686')
@@ -25,9 +25,9 @@ source=(
 validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('820b3ebb09a165aeceb39822782aca8f3ef044bb9c01015d9c126e2e87563f74'
+sha256sums=('c846038df44ee74dd910d19b346044a100f62a5b933eec2264d17008758cbaaf'
             'SKIP'
-            '8744bab5a9ab9fd8eaa885f5757fd9405aec5f958719aee2bacfad9ae159e2ca'
+            'acc0be5d140e90ad70f8576082c01eac5e0ca706f053ed2ae7cc56eddb38cf9c'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 2edd47d0..e89891a3 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.17.13-1 Kernel Configuration
+# Linux/x86 4.17.14-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y