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 522436d8..a4ad284f 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.18.3
+pkgver=4.18.5
 _srcname=linux-${pkgver}
 pkgrel=1
 arch=('i686')
@@ -24,9 +24,9 @@ validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-sha256sums=('81ed3ccef8eb43cba3d2451a963d0bbaf5392af98435d42caee82d019a8443d4'
+sha256sums=('fb090a3680eddf6f10bf895bc3075bd3f830e3d2429ce469982db5a28df647bd'
             'SKIP'
-            '582cba78ad8d5a9068465aac64b178297bb8661a26cf295dce723e0ca34a9f1d'
+            '3957b6865cff44be43d879db8131974c7a4933ae0a2462f491640a11964abd7c'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
diff --git a/extra/linux-pae/config b/extra/linux-pae/config
index 86bf4916..621b184f 100644
--- a/extra/linux-pae/config
+++ b/extra/linux-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.3-1 Kernel Configuration
+# Linux/x86 4.18.5-1 Kernel Configuration
 #
 
 #