diff --git a/arm-exynos-mp.patch b/arm-exynos-mp.patch
index d037170e3..15667ab26 100644
--- a/arm-exynos-mp.patch
+++ b/arm-exynos-mp.patch
@@ -282,26 +282,6 @@ index 81465c2..6bd8b5a 100644
  	help
  	  Support for Multi Core Timer controller on Exynos SoCs.
  
-diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
-index de4d5d9..ffe9cb3 100644
---- a/drivers/cpufreq/Kconfig.arm
-+++ b/drivers/cpufreq/Kconfig.arm
-@@ -27,6 +27,7 @@ config ARM_EXYNOS_CPUFREQ
- 
- 	  If in doubt, say N.
- 
-+if ARM_EXYNOS_CPUFREQ
- config ARM_EXYNOS4210_CPUFREQ
- 	def_bool CPU_EXYNOS4210
- 	help
-@@ -54,6 +55,7 @@ config ARM_EXYNOS5440_CPUFREQ
- 	  SoC. The nature of exynos5440 clock controller is
- 	  different than previous exynos controllers so not using
- 	  the common exynos framework.
-+endif
- 
- config ARM_HIGHBANK_CPUFREQ
- 	tristate "Calxeda Highbank-based"
 diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig
 index 31f3adb..15454ad 100644
 --- a/drivers/devfreq/Kconfig
diff --git a/config-armv7 b/config-armv7
index 5d171c819..b703a7882 100644
--- a/config-armv7
+++ b/config-armv7
@@ -85,6 +85,7 @@ CONFIG_MACH_OMAP3530_LV_SOM=y
 CONFIG_MACH_OMAP3_TORPEDO=y
 CONFIG_MACH_OVERO=y
 CONFIG_MACH_OMAP3EVM=y
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_MACH_OMAP3517EVM=y
 CONFIG_MACH_CRANEBOARD=y
 CONFIG_MACH_OMAP3_PANDORA=y
@@ -547,7 +548,7 @@ CONFIG_SERIO_OLPC_APSP=m
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
-CONFIG_CPU_IDLE_ZYNQ=y
+CONFIG_ARM_ZYNQ_CPUIDLE=y
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
diff --git a/config-armv7-generic b/config-armv7-generic
index bc60358c4..f6b75582f 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -59,11 +59,11 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 
 # highbank
 # 2013/04/19 - stability issues
-CONFIG_CPU_IDLE_CALXEDA=y
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_SATA_HIGHBANK=m
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
+CONFIG_ARM_HIGHBANK_CPUIDLE=y
 
 # errata
 # v5/v6
diff --git a/config-armv7-lpae b/config-armv7-lpae
index a1d2b8c81..f20692235 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -66,6 +66,8 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SOC_EXYNOS5250=y
 CONFIG_SOC_EXYNOS5420=y
 CONFIG_SOC_EXYNOS5440=y
+CONFIG_ARM_EXYNOS5250_CPUFREQ=y
+CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_EXYNOS_CPUFREQ=y
 # CONFIG_GENERIC_CPUFREQ_CPU0 is not set
 CONFIG_EXYNOS_THERMAL=m
diff --git a/kernel.spec b/kernel.spec
index edbdb3786..681b1d99f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -2313,6 +2313,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git6.1
+- Linux v3.11-2455-g40031da
+
 * Wed Sep 04 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.12.0-0.rc0.git5.1
 - Linux v3.11-2200-gf66c83d
 
diff --git a/sources b/sources
index c0b87ad27..6912c13a6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 fea363551ff45fbe4cb88497b863b261  linux-3.11.tar.xz
-294e3992a541813e409560ec542e394b  patch-3.11-git5.xz
+373ec3cb2cc4d906c5e9cd4adc0ea73a  patch-3.11-git6.xz