diff --git a/arch/arm/configs/m7_defconfig b/arch/arm/configs/m7_defconfig
index 235124309171..9b8b249caa06 100644
--- a/arch/arm/configs/m7_defconfig
+++ b/arch/arm/configs/m7_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.75 Kernel Configuration
+# Linux/arm 3.4.82 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -166,6 +166,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_DMA_ATTRS=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_DMA_API_DEBUG=y
@@ -382,6 +383,9 @@ CONFIG_MACH_HTC=y
 # CONFIG_MACH_JET is not set
 # CONFIG_MACH_VILLE is not set
 CONFIG_MACH_M7_UL=y
+CONFIG_CABC_DIMMING_SWITCH=y
+CONFIG_SRE_CONTROL=y
+# CONFIG_MACH_T6_UL is not set
 # CONFIG_MACH_HTC_DUMMY is not set
 
 #
@@ -394,6 +398,7 @@ CONFIG_HTC_HEADSET_MGR=y
 CONFIG_HTC_HEADSET_PMIC=y
 CONFIG_HTC_HEADSET_ONE_WIRE=y
 CONFIG_HTC_WAKE_ON_VOL=y
+# CONFIG_HTC_HEADSET_GPIO is not set
 # CONFIG_MSM_STACKED_MEMORY is not set
 CONFIG_KERNEL_MSM_CONTIG_MEM_REGION=y
 CONFIG_MSM_AMSS_VERSION=6225
@@ -579,7 +584,6 @@ CONFIG_KUSER_HELPERS=y
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
-# CONFIG_VCM is not set
 CONFIG_STRICT_MEMORY_RWX=y
 CONFIG_ARM_NR_BANKS=8
 # CONFIG_RESERVE_FIRST_PAGE is not set
@@ -637,6 +641,7 @@ CONFIG_ARCH_NR_GPIO=0
 CONFIG_PREEMPT=y
 CONFIG_PREEMPT_COUNT=y
 CONFIG_HZ=100
+CONFIG_SCHED_HRTICK=y
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
@@ -1354,6 +1359,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_ATA is not set
 CONFIG_MD=y
 # CONFIG_BLK_DEV_MD is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=y
 # CONFIG_DM_DEBUG is not set
 CONFIG_DM_CRYPT=y
@@ -1635,6 +1641,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
 # CONFIG_TOUCHSCREEN_MAX11801 is not set
+# CONFIG_TOUCHSCREEN_MAX1187X is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set
@@ -1663,6 +1670,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
 # CONFIG_TOUCHSCREEN_ATMEL_224E is not set
 # CONFIG_TOUCHSCREEN_CYPRESS_CS is not set
 CONFIG_TOUCHSCREEN_SYNAPTICS_3K=y
+# CONFIG_TOUCHSCREEN_SYNAPTICS_REMOVE_FW_TIMEOUT is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -1690,6 +1698,7 @@ CONFIG_INPUT_GPIO=y
 # CONFIG_STM_LIS3DH is not set
 # CONFIG_BMP18X is not set
 CONFIG_SENSORS_AKM8963_NST=y
+# CONFIG_SENSORS_AKM8963 is not set
 # CONFIG_SENSORS_AKM8975 is not set
 # CONFIG_SENSORS_PANASONIC_GYRO is not set
 # CONFIG_SENSORS_BMA250 is not set
@@ -1698,6 +1707,8 @@ CONFIG_SIG_MOTION=y
 CONFIG_INPUT_CAPELLA_CM3629=y
 CONFIG_SENSORS_R3GD20=y
 CONFIG_R3GD20_NEW_SENSOR_TYPE=y
+# CONFIG_SENSORS_LSM330_ACC is not set
+# CONFIG_SENSORS_LSM330_GYRO is not set
 CONFIG_MPU_SENSORS_MPU3050=y
 # CONFIG_MPU_SENSORS_ACCELEROMETER_NONE is not set
 # CONFIG_MPU_SENSORS_ADXL346 is not set
@@ -1809,7 +1820,6 @@ CONFIG_HW_RANDOM_MSM=y
 # CONFIG_RAMOOPS is not set
 CONFIG_MSM_ROTATOR=y
 CONFIG_MSM_ADSPRPC=y
-# CONFIG_MMC_GENERIC_CSDIO is not set
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2984,6 +2994,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_PCA955X is not set
 CONFIG_LEDS_PM8XXX=y
+# CONFIG_LEDS_PM8038 is not set
 # CONFIG_LEDS_PCA9633 is not set
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_REGULATOR is not set
@@ -3096,6 +3107,8 @@ CONFIG_RTC_DRV_PM8XXX=y
 # CONFIG_DMADEVICES is not set
 # CONFIG_AUXDISPLAY is not set
 CONFIG_UIO=y
+# CONFIG_UIO_PDRV is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
 CONFIG_UIO_MSM_SHAREDMEM=y
 
 #
@@ -3157,6 +3170,11 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES=y
 #
 # CONFIG_PRIMA_WLAN is not set
 
+#
+# Qualcomm Atheros Prima WLAN module
+#
+# CONFIG_PRIMA_WLAN_3x is not set
+
 #
 # Qualcomm MSM specific device drivers
 #
@@ -3426,6 +3444,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_PANIC_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set