diff --git a/config-arm-generic b/config-arm-generic
index 75fe1e55a..84b97e86c 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -9,6 +9,9 @@ CONFIG_HW_PERF_EVENTS=y
 CONFIG_NFS_FS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_SMT=y
+
 CONFIG_CC_STACKPROTECTOR=y
 
 # CONFIG_PID_IN_CONTEXTIDR is not set
@@ -169,7 +172,7 @@ CONFIG_SND_HDA_TEGRA=m
 # Qualcomm - Don't currently support IPQ router devices
 # CONFIG_IPQ_GCC_806X is not set
 # CONFIG_IPQ_LCC_806X is not set
-# CONFIG_IPQ_GCC_4019 is not st
+# CONFIG_IPQ_GCC_4019 is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
 # CONFIG_DWMAC_IPQ806X is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
@@ -186,6 +189,13 @@ CONFIG_EFI_VARS_PSTORE=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 
 # Power management / thermal / cpu scaling
+CONFIG_PM_OPP=y
+CONFIG_ARM_PSCI=y
+CONFIG_THERMAL=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_ARM_CPUIDLE is not set
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
 # CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
diff --git a/config-arm64 b/config-arm64
index e461c8cb2..f023aa660 100644
--- a/config-arm64
+++ b/config-arm64
@@ -1,11 +1,6 @@
 CONFIG_64BIT=y
 CONFIG_ARM64=y
 
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-
-# CONFIG_CPU_BIG_ENDIAN is not set
-
 # arm64 only SoCs
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_SEATTLE=y
@@ -156,6 +151,7 @@ CONFIG_STUB_CLK_HI6220=y
 CONFIG_REGULATOR_HI655X=m
 CONFIG_PHY_HI6220_USB=m
 CONFIG_COMMON_RESET_HI6220=m
+# CONFIG_ARM_HISI_ACPU_CPUFREQ is not set
 CONFIG_HI6220_MBOX=m
 
 # Tegra
diff --git a/config-armv7-generic b/config-armv7-generic
index b6eb64e02..f6ac37b77 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -35,6 +35,7 @@ CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_IRQ_CROSSBAR=y
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_ARM_CPU_SUSPEND=y
 
 # CONFIG_MCPM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -138,22 +139,9 @@ CONFIG_HIGHMEM=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ARM_MODULE_PLTS is not set
 
-CONFIG_SCHED_MC=y
-CONFIG_SCHED_SMT=y
-
 CONFIG_RCU_FANOUT=32
 
-CONFIG_CHECKPOINT_RESTORE=y
-
-# Power management / thermal / cpu scaling
-CONFIG_PM_OPP=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_PSCI=y
-CONFIG_THERMAL=y
-CONFIG_CLOCK_THERMAL=y
-# CONFIG_DEVFREQ_THERMAL is not set
-CONFIG_CPUFREQ_DT=m
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+# Dynamic Voltage and Frequency Scaling
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_DEVFREQ_EVENT=y
 CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
@@ -167,6 +155,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 CONFIG_XZ_DEC_ARM=y
 
 # CONFIG_PCI_LAYERSCAPE is not set
+
 # Do NOT enable this, it breaks stuff and makes things go slow
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 
diff --git a/config-generic b/config-generic
index d569139e6..b4f8f091f 100644
--- a/config-generic
+++ b/config-generic
@@ -1413,7 +1413,6 @@ CONFIG_NET_VENDOR_AMD=y
 CONFIG_PCNET32=m
 CONFIG_AMD8111_ETH=m
 CONFIG_PCMCIA_NMCLAN=m
-# CONFIG_AMD_XGBE is not set
 
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_ARC_EMAC=m
diff --git a/kernel.spec b/kernel.spec
index 9a5fbdd1c..ac7318bbd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2153,6 +2153,9 @@ fi
 #
 # 
 %changelog
+* Mon May 30 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM cleanups and power/cpufreq management tweaks
+
 * Mon May 23 2016 Josh Boyer <jwboyer@fedoraproject.org>
 - CVE-2016-4951 null ptr deref in tipc_nl_publ_dump (rhbz 1338625 1338626)