diff --git a/core/linux-raspberrypi/PKGBUILD b/core/linux-raspberrypi/PKGBUILD
index a248d33e9a..6c8ddcfb3b 100644
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@@ -7,12 +7,12 @@
 buildarch=20
 
 pkgbase=linux-raspberrypi
-_commit=690878e23a8b7a7625514da6d9b005b5c7d178b3
+_commit=11f2a1f8db91523fbcf10f8428f407cf3b37f936
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi"
 pkgver=3.18.7
-pkgrel=8
+pkgrel=9
 bfqver=v7r7
 arch=('armv6h' 'armv7h')
 url="http://www.kernel.org/"
@@ -30,16 +30,16 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         'cmdline.txt'
         'config.v6'
         'config.v7')
-md5sums=('420cf1e7be96d68fa099dce1cd20d7cf'
+md5sums=('84dc791474078c1722776a3e659ae20e'
          'SKIP'
          '1c7c2d0338939a9e6953a64d80861471'
          'a81346cce95baeac2c56cf60d3c7e5b6'
          '8f2743651280f5a022e541f4e95e5546'
-         '69d50a4604a587ae770e4be244e293bd'
+         '405015cdeb544575c25018b3487a2e76'
          'fa4377b3247d80efade0ed3d5ec650f1'
          '60bc3624123c183305677097bcd56212'
-         '72ead81d0d449adaaf98cf08b99c970e'
-         '0dfadce13613046c738e7925084fa15c')
+         '3870d0a94f93d46e5a365feb1ff059e2'
+         '8ecb7f548b8b6d6a15316178e80513c7')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-raspberrypi/config.v6 b/core/linux-raspberrypi/config.v6
index 193eef7854..4cbfbf30bd 100644
--- a/core/linux-raspberrypi/config.v6
+++ b/core/linux-raspberrypi/config.v6
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.7-8 Kernel Configuration
+# Linux/arm 3.18.7-9 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -496,13 +496,7 @@ CONFIG_ARM_BCM2835_CPUFREQ=y
 #
 # CPU Idle
 #
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-#
-# ARM CPU Idle Drivers
-#
+# CONFIG_CPU_IDLE is not set
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
 #
@@ -528,21 +522,11 @@ CONFIG_COREDUMP=y
 #
 # Power management options
 #
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND is not set
 # CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_APM_EMULATION is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
+# CONFIG_ARM_CPU_SUSPEND is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_NET=y
 
@@ -1655,7 +1639,6 @@ CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 # CONFIG_ATH9K_DFS_CERTIFIED is not set
 # CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
 CONFIG_ATH9K_RFKILL=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
 CONFIG_ATH9K_HTC=m
@@ -1950,7 +1933,6 @@ CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y
diff --git a/core/linux-raspberrypi/config.v7 b/core/linux-raspberrypi/config.v7
index e90d5826a3..1664f964d4 100644
--- a/core/linux-raspberrypi/config.v7
+++ b/core/linux-raspberrypi/config.v7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.7-8 Kernel Configuration
+# Linux/arm 3.18.7-9 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -501,8 +501,6 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 # CONFIG_XIP_KERNEL is not set
-CONFIG_KEXEC=y
-CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_AUTO_ZRELADDR is not set
 
@@ -538,13 +536,7 @@ CONFIG_ARM_BCM2835_CPUFREQ=y
 #
 # CPU Idle
 #
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-#
-# ARM CPU Idle Drivers
-#
+# CONFIG_CPU_IDLE is not set
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 
 #
@@ -573,22 +565,11 @@ CONFIG_COREDUMP=y
 #
 # Power management options
 #
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND is not set
 # CONFIG_HIBERNATION is not set
-CONFIG_PM_SLEEP=y
-CONFIG_PM_SLEEP_SMP=y
-# CONFIG_PM_AUTOSLEEP is not set
-# CONFIG_PM_WAKELOCKS is not set
 # CONFIG_PM_RUNTIME is not set
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-# CONFIG_APM_EMULATION is not set
-CONFIG_PM_CLK=y
-# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
-CONFIG_CPU_PM=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
+# CONFIG_ARM_CPU_SUSPEND is not set
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_NET=y
 
@@ -1706,7 +1687,6 @@ CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 # CONFIG_ATH9K_DFS_CERTIFIED is not set
 # CONFIG_ATH9K_DYNACK is not set
-# CONFIG_ATH9K_WOW is not set
 CONFIG_ATH9K_RFKILL=y
 # CONFIG_ATH9K_CHANNEL_CONTEXT is not set
 CONFIG_ATH9K_HTC=m
@@ -2001,7 +1981,6 @@ CONFIG_TTY=y
 CONFIG_VT=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
-CONFIG_VT_CONSOLE_SLEEP=y
 CONFIG_HW_CONSOLE=y
 CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_UNIX98_PTYS=y