diff --git a/config-armv7 b/config-armv7
index ba0b2b6ee..c51339ab2 100644
--- a/config-armv7
+++ b/config-armv7
@@ -1,6 +1,7 @@
 # ARM unified arch kernel
 
 # CONFIG_ARCH_BERLIN is not set
+# CONFIG_MACH_DOVE is not set
 # CONFIG_ARCH_KEYSTONE is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
@@ -243,12 +244,13 @@ CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1=m
 
 # Enable V4L2 drivers for OMAP2+
 CONFIG_MEDIA_CONTROLLER=y
-CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_V4L_PLATFORM_DRIVERS=y
 # CONFIG_VIDEO_OMAP2_VOUT is not set
-# CONFIG_VIDEO_OMAP3 is not set
-# CONFIG_VIDEO_VPFE_CAPTURE is not set
+CONFIG_VIDEO_OMAP3=m
+# CONFIG_VIDEO_OMAP4 is not set
+# CONFIG_VIDEO_OMAP4_DEBUG is not set
 # The ones below are for TI Davinci
+# CONFIG_VIDEO_VPFE_CAPTURE is not set
 # CONFIG_VIDEO_VPSS_SYSTEM is not set
 # CONFIG_VIDEO_DM6446_CCDC is not set
 # CONFIG_VIDEO_DM644X_VPBE is not set
@@ -463,7 +465,6 @@ CONFIG_HW_RANDOM_PICOXCELL=m
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
-CONFIG_MACH_UX500_DT=y
 
 CONFIG_ABX500_CORE=y
 CONFIG_ARM_U8500_CPUIDLE=y
@@ -478,6 +479,7 @@ CONFIG_KEYBOARD_NOMADIK=m
 CONFIG_DB8500_CPUFREQ_COOLING=m
 CONFIG_DB8500_THERMAL=y
 CONFIG_UX500_WATCHDOG=m
+CONFIG_AHCI_ST=m
 CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_REGULATOR_AB8500=y
 CONFIG_AB8500_USB=m
@@ -496,6 +498,7 @@ CONFIG_AB8500_BM=y
 CONFIG_AB8500_GPADC=y
 CONFIG_SENSORS_AB8500=m
 CONFIG_STE_MODEM_RPROC=m
+CONFIG_STIH415_RESET=y
 
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
@@ -524,6 +527,7 @@ CONFIG_PCI_TEGRA=y
 CONFIG_TEGRA_IOMMU_GART=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_MMC_SDHCI_TEGRA=m
+CONFIG_TEGRA_WATCHDOG=m
 
 CONFIG_I2C_TEGRA=m
 CONFIG_I2C_MUX_PCA954x=m
@@ -584,8 +588,6 @@ CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_LD9040=m
 CONFIG_DRM_PANEL_S6E8AA0=m
 
-CONFIG_TEGRA_WATCHDOG=m
-
 CONFIG_CRYPTO_DEV_TEGRA_AES=m
 
 CONFIG_GPIO_PCA953X=m
@@ -609,6 +611,8 @@ CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_I2C_CADENCE=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_XILINX_XADC=m
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
@@ -675,8 +679,6 @@ CONFIG_REGULATOR_MAX8973=m
 # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
 # CONFIG_AB8500_DEBUG is not set
 
-# CONFIG_MACH_DOVE is not set
-
 # CONFIG_SOC_VF610 is not set
 # CONFIG_MMC_TMIO is not set
 # CONFIG_SND_SOC_ADI is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 65870a9e4..59e76560a 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -35,6 +35,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_XZ_DEC_ARMTHUMB=y
 CONFIG_ARCH_HAS_TICK_BROADCAST=y
 CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
+CONFIG_IRQ_CROSSBAR=y
 
 # CONFIG_MCPM is not set
 # CONFIG_OABI_COMPAT is not set
@@ -118,7 +119,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 
 CONFIG_XZ_DEC_ARM=y
 
-CONFIG_LOCAL_TIMERS=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_CC_STACKPROTECTOR=y
 
@@ -172,6 +172,9 @@ CONFIG_DWMAC_SUNXI=y
 CONFIG_EEPROM_SUNXI_SID=m
 CONFIG_RTC_DRV_SUNXI=m
 CONFIG_PHY_SUN4I_USB=m
+CONFIG_AHCI_SUNXI=m
+CONFIG_SPI_SUN4I=m
+CONFIG_SPI_SUN6I=m
 
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
@@ -303,21 +306,19 @@ CONFIG_W1_MASTER_GPIO=m
 CONFIG_SPI=y
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_GPIO=m
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_PL022=m
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_ALTERA=m
+CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PL022=m
 CONFIG_SPI_S3C64XX=m
 CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
 CONFIG_SPI_XILINX=m
-CONFIG_SPI_DESIGNWARE=m
-CONFIG_SPI_TLE62X0=m
-CONFIG_SPI_SUN4I=m
-CONFIG_SPI_SUN6I=m
 # CONFIG_SPI_FSL_SPI is not set
 
 CONFIG_NFC_NCI_SPI=y
@@ -615,7 +616,6 @@ CONFIG_BPF_JIT=y
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_IMX is not set
 # CONFIG_AHCI_IMX is not set
-CONFIG_AHCI_SUNXI=m
 # CONFIG_CS89x0 is not set
 # CONFIG_DM9000 is not set
 # CONFIG_HW_RANDOM_ATMEL is not set
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 7c362a1e9..bc9324fde 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -113,6 +113,7 @@ CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_GPIO_DAVINCI=y
 CONFIG_I2C_DAVINCI=m
+CONFIG_TI_AEMIF=m
 # CONFIG_DAVINCI_WATCHDOG is not set
 # CONFIG_SPI_DAVINCI is not set
 # CONFIG_SND_DAVINCI_SOC is not set
diff --git a/kernel.spec b/kernel.spec
index f56f70f93..f36bc5a4d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2066,6 +2066,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Mon Apr 14 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config changes and cleanups for 3.15 merge window
+
 * Mon Apr 14 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - CVE-2014-2851 net ipv4 ping refcount issue in ping_init_sock (rhbz 1086730 1087420)