diff --git a/core/linux-mmp/PKGBUILD b/core/linux-mmp/PKGBUILD
index e5e830590..50363a304 100644
--- a/core/linux-mmp/PKGBUILD
+++ b/core/linux-mmp/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-mmp
 _srcname=linux-3.18
 _kernelname=${pkgbase#linux}
 _desc="Marvell PXA168/MMP platforms"
-pkgver=3.18.138
+pkgver=3.18.139
 pkgrel=1
 arch=('arm')
 url="https://github.com/Marvell-Semi/PXA168_kernel/tree/gplugd-dev"
@@ -27,7 +27,7 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         '0009-Revert-net-phy-Do-not-perform-software-reset-for-Gen.patch'
         'config')
 md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
-         'dca1187e78694a5413a3d2211f910ef4'
+         '38831def159a8a27ecf67099e8b2e21b'
          'bfd81313763714222a0ba84d51ad12bc'
          'f2b57a976904e07acc637a963691b588'
          'a1746d9678717d18eb57ea318f68be6d'
@@ -37,7 +37,7 @@ md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
          '132bd1fc48bf35847ff6998050673733'
          '9b04a627cf70d3d69eb02c2544170b06'
          '7bb7483b63e8f348cb8981f0b04cf3cc'
-         '86b9bdfc1bc2f473960310930e908611')
+         'a13cfca7d2ea59ca6c7fc63dcdb0aa9e')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-mmp/config b/core/linux-mmp/config
index d90278040..e9df3d273 100644
--- a/core/linux-mmp/config
+++ b/core/linux-mmp/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.131-1 Kernel Configuration
+# Linux/arm 3.18.139-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1839,6 +1839,7 @@ CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_N_GSM is not set
 # CONFIG_TRACE_SINK is not set
+CONFIG_LDISC_AUTOLOAD=y
 CONFIG_DEVKMEM=y
 
 #
@@ -1867,7 +1868,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_HVC_DCC is not set
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
-# CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set