diff --git a/config-armv7 b/config-armv7
index 37d8485e6..6e34dec47 100644
--- a/config-armv7
+++ b/config-armv7
@@ -27,7 +27,8 @@ CONFIG_ARCH_ZYNQ=y
 # CONFIG_ARM_VIRT_EXT is not set
 
 # highbank
-CONFIG_CPU_IDLE_CALXEDA=y
+# 2013/04/19 - stability issues
+# CONFIG_CPU_IDLE_CALXEDA is not set
 CONFIG_EDAC_HIGHBANK_MC=m
 CONFIG_EDAC_HIGHBANK_L2=m
 CONFIG_SATA_HIGHBANK=m
@@ -310,9 +311,7 @@ CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_OMAP_SOC_OVERO=m
 # CONFIG_SND_OMAP_SOC_RX51 is not set
-CONFIG_SND_OMAP_SOC_SDP3430=m
 CONFIG_SND_OMAP_SOC_SDP4430=m
-CONFIG_SND_OMAP_SOC_ZOOM2=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TWL4030=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 5f3159bed..d6f2c84c0 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -84,10 +84,11 @@ CONFIG_SCHED_SMT=y
 CONFIG_RCU_FANOUT=32
 CONFIG_RCU_FANOUT_LEAF=16
 
-CONFIG_CPU_IDLE=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
+# 2013/04/19 - disable due to stability issues in 3.9 for the moment
+# CONFIG_CPU_IDLE is not set
+## CONFIG_CPU_IDLE_GOV_LADDER is not set
+# CONFIG_CPU_IDLE_GOV_MENU is not set
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
 
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_LSM_MMAP_MIN_ADDR=32768
diff --git a/config-armv7-tegra b/config-armv7-tegra
index 99d5985fa..0058f0adb 100644
--- a/config-armv7-tegra
+++ b/config-armv7-tegra
@@ -60,6 +60,7 @@ CONFIG_SND_SOC_TEGRA_WM9712=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA30_AHUB=m
 CONFIG_SND_SOC_TEGRA30_I2S=m
+CONFIG_SND_SOC_TEGRA20_AC97=m
 
 # AC100 (PAZ00)
 CONFIG_MFD_NVEC=y
diff --git a/kernel.spec b/kernel.spec
index 1de482622..3a4ed2add 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2288,6 +2288,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Apr 19 2013 Peter Robinson <pbrobinson@fedoraproject.org> 
+- Temporaily disable cpu idle on ARM as it appears to be causing stability issues
+
 * Fri Apr 19 2013 Josh Boyer <jwboyer@redhat.com>
 - Disable Intel HDA and enable RSXX block dev on ppc64/ppc64p7