UBUNTU: [Config] Updateconfigs after rebase to v3.5-rc1

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

9 files changed, 192 insertions, 122 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 86368473942..db370621846 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -76,7 +76,6 @@ CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HARDLOCKUP_DETECTOR=y
@@ -118,13 +117,11 @@ CONFIG_KEXEC=y
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
 CONFIG_KSM=y
-# CONFIG_KTIME_SCALAR is not set
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_LIBERTAS_MESH=y
 CONFIG_LIBIPW_DEBUG=y
-CONFIG_LLC=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -189,7 +186,6 @@ CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
-CONFIG_PERF_COUNTERS=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
@@ -197,7 +193,7 @@ CONFIG_PMIC_DA903X=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
-CONFIG_POWER_SUPPLY=y
+# CONFIG_PM_WAKELOCKS is not set
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT is not set
@@ -273,7 +269,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_ET61X251=m
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_G_MULTI is not set
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 736434d0c1f..16ea4f80161 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -83,7 +83,6 @@ CONFIG_HAMRADIO=y
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HIDRAW=y
-# CONFIG_HIGHMEM is not set
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 # CONFIG_HUGETLB_PAGE is not set
@@ -119,12 +118,10 @@ CONFIG_KEYBOARD_SAMSUNG=m
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
 # CONFIG_KSM is not set
-CONFIG_KTIME_SCALAR=y
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
 # CONFIG_LIBERTAS_MESH is not set
-CONFIG_LLC=m
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -194,7 +191,6 @@ CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 # CONFIG_PCCARD is not set
 # CONFIG_PCI_SYSCALL is not set
-CONFIG_PERF_COUNTERS=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PL330_DMA=m
 CONFIG_PMIC_ADP5520=y
@@ -202,7 +198,7 @@ CONFIG_PMIC_DA903X=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PM_WAKELOCKS=y
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT is not set
@@ -280,7 +276,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB_ARCH_HAS_XHCI is not set
 CONFIG_USB_DWC3=m
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_ET61X251 is not set
 CONFIG_USB_GADGET=y
 CONFIG_USB_GPIO_VBUS=y
 CONFIG_USB_G_MULTI=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index d30d438f27b..f3547731a8b 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -45,10 +45,8 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
 CONFIG_KGDB=y
 # CONFIG_KSM is not set
-CONFIG_KTIME_SCALAR=y
 CONFIG_LATENCYTOP=y
 # CONFIG_LIBERTAS_MESH is not set
-CONFIG_LLC=m
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_MMC_BLOCK=y
@@ -64,7 +62,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PCI_SYSCALL is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 # CONFIG_PM_DEBUG is not set
-CONFIG_POWER_SUPPLY=y
+CONFIG_PM_WAKELOCKS=y
 CONFIG_PRINT_QUOTA_WARNING=y
 CONFIG_RCU_FANOUT=32
 # CONFIG_REGULATOR_DEBUG is not set
@@ -77,7 +75,6 @@ CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_SMT is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SENSORS_SCH56XX_COMMON=m
 # CONFIG_SND_EMU10K1_SEQ is not set
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
@@ -90,7 +87,6 @@ CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_USB=y
 # CONFIG_USB_ARCH_HAS_XHCI is not set
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
-# CONFIG_USB_ET61X251 is not set
 CONFIG_USB_G_MULTI=m
 # CONFIG_USB_M66592 is not set
 # CONFIG_USB_MUSB_TUSB6010 is not set
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 6ca28123fe5..9881495f8fb 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -44,7 +44,6 @@ CONFIG_EXT2_FS=y
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HIDRAW is not set
-CONFIG_HIGHMEM=y
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_I2CPLD is not set
 # CONFIG_HVC_DCC is not set
@@ -134,7 +133,6 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 # CONFIG_OSF_PARTITION is not set
 # CONFIG_PARPORT_1284 is not set
 # CONFIG_PATA_ARASAN_CF is not set
-# CONFIG_PERF_COUNTERS is not set
 CONFIG_PL330_DMA=y
 # CONFIG_PMIC_ADP5520 is not set
 # CONFIG_PMIC_DA903X is not set
@@ -163,6 +161,7 @@ CONFIG_SATA_AHCI_PLATFORM=y
 # CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
 # CONFIG_SECURITY_SELINUX_DISABLE is not set
 # CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SENSORS_SCH56XX_COMMON is not set
 CONFIG_SERIAL_8250=m
 # CONFIG_SERIAL_AMBA_PL010 is not set
 CONFIG_SERIAL_AMBA_PL011=y
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 2b73fda9bd4..6fb7579860f 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -44,7 +44,6 @@ CONFIG_FTRACE=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
-# CONFIG_HIGHMEM is not set
 CONFIG_HTC_EGPIO=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HVC_DCC=y
@@ -134,7 +133,6 @@ CONFIG_OC_ETM=y
 CONFIG_OSF_PARTITION=y
 CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
-CONFIG_PERF_COUNTERS=y
 CONFIG_PL330_DMA=m
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
@@ -163,6 +161,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
 CONFIG_SECURITY_TOMOYO=y
+CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_AMBA_PL010=m
 CONFIG_SERIAL_AMBA_PL011=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 2087422053b..404eac2b12d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2,7 +2,6 @@
 # Common config options automatically generated by splitconfig.pl
 #
 CONFIG_32BIT=y
-CONFIG_3C359=m
 CONFIG_3C515=m
 # CONFIG_40x is not set
 # CONFIG_44x is not set
@@ -20,13 +19,6 @@ CONFIG_9P_FS=m
 CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_AB3100_CORE=y
 CONFIG_AB3100_OTP=m
-CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL=y
-CONFIG_AB8500_BM=y
-CONFIG_AB8500_CORE=y
-CONFIG_AB8500_DEBUG=y
-CONFIG_AB8500_GPADC=y
-CONFIG_AB8500_USB=m
-CONFIG_ABYSS=m
 CONFIG_AC3200=m
 CONFIG_AC97_BUS=m
 # CONFIG_ACCESSIBILITY is not set
@@ -116,6 +108,7 @@ CONFIG_AD7816=m
 CONFIG_AD7887=m
 CONFIG_AD799X=m
 CONFIG_AD799X_RING_BUFFER=y
+CONFIG_AD8366=m
 CONFIG_AD9832=m
 CONFIG_AD9834=m
 CONFIG_AD9850=m
@@ -206,16 +199,10 @@ CONFIG_AMD_NUMA=y
 CONFIG_AMD_PHY=y
 CONFIG_AMILO_RFKILL=m
 CONFIG_ANDROID=y
-CONFIG_ANDROID_ALARM_OLDDRV_COMPAT=y
 CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ANDROID_INTF_ALARM=y
 CONFIG_ANDROID_INTF_ALARM_DEV=y
 CONFIG_ANDROID_LOGGER=m
 CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_ANDROID_PERSISTENT_RAM=y
-CONFIG_ANDROID_RAM_CONSOLE=y
-CONFIG_ANDROID_SWITCH=m
-CONFIG_ANDROID_SWITCH_GPIO=m
 CONFIG_ANDROID_TIMED_GPIO=m
 CONFIG_ANDROID_TIMED_OUTPUT=y
 CONFIG_ANON_INODES=y
@@ -255,7 +242,6 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPUFREQ=y
 CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
@@ -263,6 +249,7 @@ CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_ARCH_HAS_ILOG2_U64=y
 CONFIG_ARCH_HAS_OPP=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_ARCH_HIBERNATION_HEADER=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
@@ -270,8 +257,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # CONFIG_ARCH_IOP13XX is not set
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_KS8695 is not set
@@ -315,11 +300,11 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_U8500 is not set
-# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
 CONFIG_ARCH_USES_PG_UNCACHED=y
 # CONFIG_ARCH_VERSATILE is not set
 # CONFIG_ARCH_VEXPRESS is not set
@@ -345,6 +330,7 @@ CONFIG_ARCNET_RIM_I=m
 CONFIG_ARM=y
 CONFIG_ARM_AMBA=y
 # CONFIG_ARM_APPENDED_DTB is not set
+CONFIG_ARM_ARCH_TIMER=y
 CONFIG_ARM_CPU_SUSPEND=y
 CONFIG_ARM_CPU_TOPOLOGY=y
 CONFIG_ARM_DMA_MEM_BUFFERABLE=y
@@ -536,6 +522,7 @@ CONFIG_BACKLIGHT_DA903X=m
 CONFIG_BACKLIGHT_DA9052=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_LM3533=m
 CONFIG_BACKLIGHT_LP855X=m
 CONFIG_BACKLIGHT_MAX8925=m
 CONFIG_BACKLIGHT_PANDORA=m
@@ -548,6 +535,7 @@ CONFIG_BACKLIGHT_WM831X=m
 CONFIG_BASE_FULL=y
 CONFIG_BASE_SMALL=0
 CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
 # CONFIG_BATMAN_ADV_DEBUG is not set
 CONFIG_BATTERY_BQ27X00_I2C=y
 CONFIG_BATTERY_BQ27X00_PLATFORM=y
@@ -664,10 +652,13 @@ CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLOCK=y
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BMAC=m
-CONFIG_BMP085=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+CONFIG_BMP085_SPI=m
 CONFIG_BNA=m
 CONFIG_BNX2=m
 CONFIG_BNX2X=m
+CONFIG_BOARD_TPCI200=m
 CONFIG_BONDING=m
 # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
 CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
@@ -685,6 +676,7 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_BRCMDBG is not set
 CONFIG_BRCMFMAC=m
 CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_SDIO_OOB=y
 CONFIG_BRCMFMAC_USB=y
 CONFIG_BRCMSMAC=m
 CONFIG_BRCMUTIL=m
@@ -717,6 +709,7 @@ CONFIG_BROADCOM_PHY=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BT=m
+CONFIG_BTREE=y
 CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 CONFIG_BT_ATH3K=m
@@ -746,6 +739,7 @@ CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_WILINK=m
 CONFIG_BUG=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_C101=m
 CONFIG_C2PORT=m
 CONFIG_C2PORT_DURAMAR_2150=m
@@ -820,6 +814,7 @@ CONFIG_CC_STACKPROTECTOR=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
+# CONFIG_CELL_CPU is not set
 CONFIG_CEPH_FS=m
 CONFIG_CEPH_LIB=m
 # CONFIG_CEPH_LIB_PRETTYDEBUG is not set
@@ -885,6 +880,15 @@ CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
 CONFIG_CLZ_TAB=y
+CONFIG_CMA=y
+CONFIG_CMA_ALIGNMENT=8
+CONFIG_CMA_AREAS=7
+# CONFIG_CMA_DEBUG is not set
+CONFIG_CMA_SIZE_MBYTES=16
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_CMM=y
@@ -921,8 +925,14 @@ CONFIG_COMEDI_ADV_PCI_DIO=m
 CONFIG_COMEDI_AIO_AIO12_8=m
 CONFIG_COMEDI_AIO_IIRO_16=m
 CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
 CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
 CONFIG_COMEDI_AMPLC_PC263=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
 CONFIG_COMEDI_AMPLC_PCI224=m
 CONFIG_COMEDI_AMPLC_PCI230=m
 CONFIG_COMEDI_BOND=m
@@ -938,12 +948,16 @@ CONFIG_COMEDI_CONTEC_PCI_DIO=m
 CONFIG_COMEDI_DAQBOARD2000=m
 CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS08_PCI=m
 CONFIG_COMEDI_DAS16=m
 CONFIG_COMEDI_DAS16M1=m
 CONFIG_COMEDI_DAS1800=m
 CONFIG_COMEDI_DAS6402=m
 CONFIG_COMEDI_DAS800=m
 # CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
 CONFIG_COMEDI_DMM32AT=m
 CONFIG_COMEDI_DT2801=m
 CONFIG_COMEDI_DT2811=m
@@ -1097,6 +1111,7 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CROSS_COMPILE=""
+CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_AEAD2=y
@@ -1131,6 +1146,7 @@ CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DEV_GEODE=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_CRYPTO_DEV_NX=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_PADLOCK=y
@@ -1205,11 +1221,13 @@ CONFIG_CYCLADES=m
 CONFIG_CYCLADES_SYNC=m
 CONFIG_CYCLOMX_X25=y
 # CONFIG_CYZ_INTR is not set
+CONFIG_DA9052_WATCHDOG=m
 CONFIG_DAVICOM_PHY=y
 CONFIG_DCA=m
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DCB=y
 CONFIG_DCDBAS=m
+CONFIG_DDR=y
 CONFIG_DE2104X=m
 CONFIG_DE2104X_DSL=0
 CONFIG_DE4X5=m
@@ -1355,6 +1373,8 @@ CONFIG_DQL=y
 CONFIG_DRAGONRISE_FF=y
 # CONFIG_DRBD_FAULT_INJECTION is not set
 CONFIG_DRM=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_CIRRUS_QEMU is not set
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
@@ -1367,6 +1387,7 @@ CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_MEDFIELD=y
 CONFIG_DRM_MGA=m
+# CONFIG_DRM_MGAG200 is not set
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
@@ -1396,9 +1417,12 @@ CONFIG_DUMMY=m
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DVB_A8293=m
 CONFIG_DVB_AF9013=m
+CONFIG_DVB_AF9033=m
 CONFIG_DVB_AS102=m
 CONFIG_DVB_ATBM8830=m
 CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
 CONFIG_DVB_AV7110=m
 CONFIG_DVB_AV7110_OSD=y
 CONFIG_DVB_B2C2_FLEXCOP=m
@@ -1445,6 +1469,7 @@ CONFIG_DVB_ISL6423=m
 CONFIG_DVB_IT913X_FE=m
 CONFIG_DVB_IX2505V=m
 CONFIG_DVB_L64781=m
+CONFIG_DVB_LG2160=m
 CONFIG_DVB_LGDT3305=m
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_LGS8GL5=m
@@ -1510,6 +1535,7 @@ CONFIG_DVB_USB_A800=m
 CONFIG_DVB_USB_AF9005=m
 CONFIG_DVB_USB_AF9005_REMOTE=m
 CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
 CONFIG_DVB_USB_ANYSEE=m
 CONFIG_DVB_USB_AU6610=m
 CONFIG_DVB_USB_AZ6007=m
@@ -1563,9 +1589,6 @@ CONFIG_EARLY_PRINTK_INTEL_MID=y
 CONFIG_EASYCAP=m
 # CONFIG_EASYCAP_DEBUG is not set
 CONFIG_ECHO=m
-CONFIG_ECONET=m
-CONFIG_ECONET_AUNUDP=y
-CONFIG_ECONET_NATIVE=y
 CONFIG_ECRYPT_FS=y
 CONFIG_EDAC=y
 CONFIG_EDAC_AMD64=m
@@ -1624,8 +1647,6 @@ CONFIG_EL2=m
 CONFIG_EL3=m
 CONFIG_ELECTRA_CF=m
 CONFIG_ELF_CORE=y
-CONFIG_ELMC=m
-CONFIG_ELMC_II=m
 CONFIG_ELPLUS=m
 # CONFIG_EMBEDDED is not set
 CONFIG_ENC28J60=m
@@ -1666,6 +1687,9 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS_XATTR=y
+CONFIG_EXTCON=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_MAX8997=m
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 CONFIG_EXYNOS_VIDEO=y
@@ -1690,6 +1714,9 @@ CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_ATY_CT=y
 CONFIG_FB_ATY_GENERIC_LCD=y
 CONFIG_FB_ATY_GX=y
+CONFIG_FB_AUO_K1900=m
+CONFIG_FB_AUO_K1901=m
+CONFIG_FB_AUO_K190X=m
 CONFIG_FB_BROADSHEET=m
 CONFIG_FB_CARILLO_RANCH=m
 CONFIG_FB_CARMINE=m
@@ -1837,7 +1864,6 @@ CONFIG_FT1000_USB=m
 CONFIG_FTL=m
 # CONFIG_FTMAC100 is not set
 CONFIG_FTRACE_MCOUNT_RECORD=y
-CONFIG_FTRACE_NMI_ENTER=y
 # CONFIG_FTRACE_STARTUP_TEST is not set
 CONFIG_FTRACE_SYSCALLS=y
 # CONFIG_FTR_FIXUP_SELFTEST is not set
@@ -1897,7 +1923,11 @@ CONFIG_GENERIC_LOCKBREAK=y
 CONFIG_GENERIC_NVRAM=y
 CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TBSYNC=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_TRACER=y
 CONFIG_GEOS=y
 # CONFIG_GE_FPGA is not set
@@ -1917,8 +1947,10 @@ CONFIG_GPIO_74X164=m
 CONFIG_GPIO_ADP5520=m
 CONFIG_GPIO_ADP5588=m
 CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_EM=m
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
 CONFIG_GPIO_INTEL_PMIC=y
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_JANZ_TTL=m
@@ -1930,10 +1962,12 @@ CONFIG_GPIO_MAX732X=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_MCP23S08=m
 CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_MSIC=y
 CONFIG_GPIO_PCA953X=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_PCH=m
 CONFIG_GPIO_PL061=y
+CONFIG_GPIO_RC5T583=y
 CONFIG_GPIO_RDC321X=m
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_STMPE=y
@@ -1974,10 +2008,10 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
 CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
 CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
@@ -1998,6 +2032,7 @@ CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_KVM=y
 CONFIG_HAVE_KVM_EVENTFD=y
 CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
@@ -2042,7 +2077,7 @@ CONFIG_HID_A4TECH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
-# CONFIG_HID_BATTERY_STRENGTH is not set
+CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
@@ -2051,6 +2086,7 @@ CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_EMS_FF=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_GENERIC=m
 CONFIG_HID_GREENASIA=m
 CONFIG_HID_GYRATION=m
 CONFIG_HID_HOLTEK=m
@@ -2091,12 +2127,12 @@ CONFIG_HID_TOPSEED=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WACOM=m
-CONFIG_HID_WACOM_POWER_SUPPLY=y
 CONFIG_HID_WALTOP=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_WIIMOTE_EXT=y
 CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
+CONFIG_HIGHMEM=y
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 CONFIG_HIGHPTE=y
@@ -2208,9 +2244,11 @@ CONFIG_HW_CONSOLE=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_ATMEL=m
 CONFIG_HW_RANDOM_GEODE=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_PASEMI=m
+CONFIG_HW_RANDOM_PSERIES=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_VIA=m
 CONFIG_HW_RANDOM_VIRTIO=m
@@ -2299,12 +2337,6 @@ CONFIG_I8K=m
 CONFIG_IA32_EMULATION=y
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
-CONFIG_IBMLANA=m
-CONFIG_IBMLS=m
-# CONFIG_IBMMCA_SCSI_DEV_RESET is not set
-CONFIG_IBMMCA_SCSI_ORDER_STANDARD=y
-CONFIG_IBMOL=m
-CONFIG_IBMTR=m
 CONFIG_IBMVETH=m
 CONFIG_IBMVIO=y
 CONFIG_IBM_ASM=m
@@ -2330,6 +2362,7 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_IDE_TIMINGS=y
 CONFIG_IDE_XFER_MODE=y
+CONFIG_IE6XX_WDT=m
 CONFIG_IEEE802154=m
 CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_DRIVERS=m
@@ -2394,6 +2427,7 @@ CONFIG_INFINIBAND_MTHCA=m
 CONFIG_INFINIBAND_MTHCA_DEBUG=y
 CONFIG_INFINIBAND_NES=m
 # CONFIG_INFINIBAND_NES_DEBUG is not set
+CONFIG_INFINIBAND_OCRDMA=m
 CONFIG_INFINIBAND_QIB=m
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_SRPT=m
@@ -2429,7 +2463,6 @@ CONFIG_INIT_PASS_ALL_PARAMS=y
 CONFIG_INOTIFY_USER=y
 CONFIG_INPUT=y
 CONFIG_INPUT_88PM860X_ONKEY=m
-CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_INPUT_AD714X=m
 CONFIG_INPUT_AD714X_I2C=m
 CONFIG_INPUT_AD714X_SPI=m
@@ -2458,6 +2491,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_INPUT_KEYSPAN_REMOTE=m
 CONFIG_INPUT_KXTJ9=m
 # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_INPUT_MAX8925_ONKEY=m
 CONFIG_INPUT_MAX8997_HAPTIC=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
@@ -2535,11 +2569,11 @@ CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_OPTS=m
 CONFIG_IP6_NF_MATCH_RPFILTER=m
 CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_SECURITY=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IPACK_BUS=m
 CONFIG_IPC_NS=y
 CONFIG_IPDDP=m
 CONFIG_IPDDP_DECAP=y
@@ -2756,6 +2790,7 @@ CONFIG_IXGBE=m
 CONFIG_IXGBEVF=m
 CONFIG_IXGBE_DCA=y
 CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_HWMON=y
 CONFIG_JBD=y
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@@ -2829,6 +2864,7 @@ CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_HIGHBANK=y
 CONFIG_KEYBOARD_LKKBD=m
 CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
 CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_MAX7359=m
 CONFIG_KEYBOARD_MCS=m
@@ -2866,6 +2902,7 @@ CONFIG_KS8851_MLL=m
 CONFIG_KS959_DONGLE=m
 CONFIG_KSDAZZLE_DONGLE=m
 CONFIG_KSZ884X_PCI=m
+CONFIG_KTIME_SCALAR=y
 CONFIG_KVM=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_APIC_ARCHITECTURE=y
@@ -2906,11 +2943,13 @@ CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_DA903X=m
+CONFIG_LEDS_DA9052=m
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
@@ -2934,6 +2973,7 @@ CONFIG_LEDS_TRIGGER_GPIO=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
 CONFIG_LEDS_WM831X_STATUS=m
 CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_WRAP=m
@@ -2982,6 +3022,7 @@ CONFIG_LIS3L02DQ_BUF_KFIFO=y
 # CONFIG_LIS3L02DQ_BUF_RING_SW is not set
 CONFIG_LITELINK_DONGLE=m
 # CONFIG_LKDTM is not set
+CONFIG_LLC=m
 CONFIG_LLC2=m
 CONFIG_LNE390=m
 CONFIG_LOCALVERSION=""
@@ -2997,6 +3038,7 @@ CONFIG_LOCKUP_DETECTOR=y
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_LP486E=m
+CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_LRU_CACHE=m
@@ -3031,11 +3073,13 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
 CONFIG_MAC80211_RC_PID=y
 # CONFIG_MAC80211_TKIP_DEBUG is not set
 # CONFIG_MAC80211_VERBOSE_DEBUG is not set
+# CONFIG_MAC80211_VERBOSE_MESH_SYNC_DEBUG is not set
 # CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG is not set
 # CONFIG_MAC80211_VERBOSE_MPATH_DEBUG is not set
 # CONFIG_MAC80211_VERBOSE_MPL_DEBUG is not set
 # CONFIG_MAC80211_VERBOSE_PS_DEBUG is not set
 # CONFIG_MAC80211_VERBOSE_TDLS_DEBUG is not set
+# CONFIG_MAC802154 is not set
 CONFIG_MACE=m
 # CONFIG_MACE_AAUI_PORT is not set
 CONFIG_MACHZ_WDT=m
@@ -3069,7 +3113,6 @@ CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_MAC_EMUMOUSEBTN=m
 CONFIG_MAC_FLOPPY=m
-CONFIG_MADGEMC=m
 CONFIG_MANTIS_CORE=m
 CONFIG_MARVELL_PHY=y
 # CONFIG_MATH_EMULATION is not set
@@ -3079,11 +3122,7 @@ CONFIG_MAX1363_RING_BUFFER=y
 # CONFIG_MAX517 is not set
 CONFIG_MAX63XX_WATCHDOG=m
 CONFIG_MAX8925_POWER=m
-CONFIG_MAX8997_MUIC=m
 # CONFIG_MAXSMP is not set
-CONFIG_MCA=y
-CONFIG_MCA_LEGACY=y
-# CONFIG_MCA_PROC_FS is not set
 # CONFIG_MCORE2 is not set
 CONFIG_MCP2120_DONGLE=m
 # CONFIG_MCRUSOE is not set
@@ -3093,6 +3132,8 @@ CONFIG_MD=y
 CONFIG_MDA_CONSOLE=m
 CONFIG_MDIO=m
 CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_GPIO=m
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_FAULTY=m
@@ -3108,6 +3149,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEDIA_TUNER=m
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
+CONFIG_MEDIA_TUNER_FC0011=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MT2060=m
@@ -3127,6 +3169,7 @@ CONFIG_MEDIA_TUNER_TDA8290=m
 CONFIG_MEDIA_TUNER_TDA9887=m
 CONFIG_MEDIA_TUNER_TEA5761=m
 CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_TUA9001=m
 CONFIG_MEDIA_TUNER_XC2028=m
 CONFIG_MEDIA_TUNER_XC4000=m
 CONFIG_MEDIA_TUNER_XC5000=m
@@ -3137,6 +3180,7 @@ CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_SAS=m
 # CONFIG_MELAN is not set
+CONFIG_MEMORY=y
 CONFIG_MEMORY_FAILURE=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
@@ -3153,9 +3197,14 @@ CONFIG_MFD_DA9052_I2C=y
 CONFIG_MFD_DA9052_SPI=y
 CONFIG_MFD_INTEL_MSIC=y
 CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_MAX77693=y
 CONFIG_MFD_MC13783=m
 CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_OMAP_USB_HOST=y
+CONFIG_MFD_PALMAS=y
 CONFIG_MFD_PCF50633=m
 CONFIG_MFD_RC5T583=y
 CONFIG_MFD_RDC321X=m
@@ -3171,7 +3220,7 @@ CONFIG_MFD_VX855=m
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_MFD_WM831X=y
 CONFIG_MFD_WM8350=y
-CONFIG_MFD_WM8400=m
+CONFIG_MFD_WM8400=y
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 CONFIG_MG_DISK=m
@@ -3206,6 +3255,7 @@ CONFIG_MKISS=m
 CONFIG_MLX4_CORE=m
 CONFIG_MLX4_DEBUG=y
 CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -3347,6 +3397,9 @@ CONFIG_MTD_NAND_GPIO=m
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_NAND_OMAP2=y
+CONFIG_MTD_NAND_OMAP_BCH=y
+# CONFIG_MTD_NAND_OMAP_BCH4 is not set
+CONFIG_MTD_NAND_OMAP_BCH8=y
 CONFIG_MTD_NAND_PASEMI=m
 CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_RICOH=m
@@ -3391,7 +3444,6 @@ CONFIG_MTD_SWAP=m
 CONFIG_MTD_TS5500=m
 CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_BEB_RESERVE=1
-# CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_MTD_UBI_GLUEBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTRR=y
@@ -3407,6 +3459,7 @@ CONFIG_MWAVE=m
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_PCIE=m
 CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_USB=m
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_MWL8K=m
@@ -3428,7 +3481,6 @@ CONFIG_NCPFS_STRONG=y
 CONFIG_NCP_FS=m
 CONFIG_NE2000=m
 CONFIG_NE2K_PCI=m
-CONFIG_NE2_MCA=m
 CONFIG_NE3210=m
 CONFIG_NEED_MULTIPLE_NODES=y
 CONFIG_NEED_PER_CPU_KM=y
@@ -3501,6 +3553,7 @@ CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_LOG=m
@@ -3584,9 +3637,11 @@ CONFIG_NET_SCHED=y
 CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_CBQ=m
 CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_CODEL=m
 CONFIG_NET_SCH_DRR=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_FIFO=y
+CONFIG_NET_SCH_FQ_CODEL=m
 CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HTB=m
@@ -3651,13 +3706,16 @@ CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_NET_VENDOR_TI=y
 CONFIG_NET_VENDOR_TOSHIBA=y
 CONFIG_NET_VENDOR_VIA=y
+CONFIG_NET_VENDOR_WIZNET=y
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_NET_VENDOR_XIRCOM=y
 CONFIG_NEW_LEDS=y
 CONFIG_NFC=m
+CONFIG_NFC_HCI=m
 # CONFIG_NFC_LLCP is not set
 CONFIG_NFC_NCI=m
 CONFIG_NFC_PN533=m
+CONFIG_NFC_SHDLC=y
 CONFIG_NFC_WILINK=m
 CONFIG_NFSD=m
 # CONFIG_NFSD_FAULT_INJECTION is not set
@@ -3671,6 +3729,7 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_V2=y
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
@@ -3762,6 +3821,17 @@ CONFIG_NLS_ISO8859_8=m
 CONFIG_NLS_ISO8859_9=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NODES_SPAN_OTHER_NODES=y
 # CONFIG_NOHIGHMEM is not set
@@ -3804,14 +3874,12 @@ CONFIG_OF_NET=y
 CONFIG_OF_PCI=y
 CONFIG_OF_PCI_IRQ=y
 # CONFIG_OF_SELFTEST is not set
-CONFIG_OF_SPI=y
 CONFIG_OLD_BELKIN_DONGLE=m
 CONFIG_OMAP2_DSS=y
 # CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS is not set
 CONFIG_OMAP2_DSS_DEBUG_SUPPORT=y
 CONFIG_OMAP2_DSS_DPI=y
 # CONFIG_OMAP2_DSS_DSI is not set
-# CONFIG_OMAP2_DSS_FAKE_VSYNC is not set
 CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
 # CONFIG_OMAP2_DSS_RFBI is not set
 CONFIG_OMAP2_DSS_SDI=y
@@ -3866,7 +3934,6 @@ CONFIG_PANASONIC_LAPTOP=m
 CONFIG_PANEL=m
 CONFIG_PANEL_ACX565AKM=m
 # CONFIG_PANEL_CHANGE_MESSAGE is not set
-CONFIG_PANEL_DVI=y
 CONFIG_PANEL_GENERIC_DPI=y
 CONFIG_PANEL_LGPHILIPS_LB035Q02=m
 CONFIG_PANEL_NEC_NL8048HL11_01B=m
@@ -3874,6 +3941,7 @@ CONFIG_PANEL_PARPORT=0
 CONFIG_PANEL_PICODLP=m
 CONFIG_PANEL_PROFILE=5
 CONFIG_PANEL_SHARP_LS037V7DW01=y
+CONFIG_PANEL_TFP410=m
 CONFIG_PANEL_TPO_TD043MTEA1=y
 CONFIG_PANTHERLORD_FF=y
 CONFIG_PARAVIRT=y
@@ -4021,7 +4089,6 @@ CONFIG_PCMCIA_AXNET=m
 CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_IBMTR=m
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_PCMCIA_NINJA_SCSI=m
 CONFIG_PCMCIA_NMCLAN=m
@@ -4068,6 +4135,7 @@ CONFIG_PMAC_SMU=y
 # CONFIG_PMBUS is not set
 CONFIG_PMIC_DA9052=y
 CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_AUTOSLEEP is not set
 CONFIG_PM_CLK=y
 CONFIG_PM_OPP=y
 CONFIG_PM_SLEEP=y
@@ -4076,6 +4144,9 @@ CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PN544_HCI_NFC=m
 CONFIG_PN544_NFC=m
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
@@ -4086,7 +4157,11 @@ CONFIG_POSIX_MQUEUE=y
 CONFIG_POSIX_MQUEUE_SYSCTL=y
 CONFIG_POWER3=y
 CONFIG_POWER4=y
-# CONFIG_POWER4_ONLY is not set
+# CONFIG_POWER4_CPU is not set
+# CONFIG_POWER5_CPU is not set
+# CONFIG_POWER6_CPU is not set
+# CONFIG_POWER7_CPU is not set
+CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PPC=y
 CONFIG_PPC32=y
@@ -4178,6 +4253,7 @@ CONFIG_PRINTK=y
 CONFIG_PRINT_STACK_DEPTH=64
 CONFIG_PRISM2_USB=m
 CONFIG_PRISM54=m
+CONFIG_PROBE_EVENTS=y
 CONFIG_PROCESSOR_SELECT=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_PROC_EVENTS=y
@@ -4190,7 +4266,6 @@ CONFIG_PROC_VMCORE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
 CONFIG_PROFILING=y
-CONFIG_PROTEON=m
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_PS3GELIC_UDBG is not set
@@ -4201,6 +4276,7 @@ CONFIG_PS3_FLASH=m
 CONFIG_PS3_HTAB_SIZE=20
 CONFIG_PS3_LPM=m
 CONFIG_PS3_PS3AV=y
+# CONFIG_PS3_REPOSITORY_WRITE is not set
 CONFIG_PS3_ROM=m
 CONFIG_PS3_STORAGE=m
 CONFIG_PS3_SYS_MANAGER=y
@@ -4208,6 +4284,7 @@ CONFIG_PS3_VRAM=m
 CONFIG_PS3_VUART=y
 CONFIG_PSERIES_IDLE=y
 CONFIG_PSERIES_MSI=y
+CONFIG_PSTORE_RAM=m
 # CONFIG_PTP_1588_CLOCK is not set
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
@@ -4253,12 +4330,12 @@ CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID6_PQ=m
 CONFIG_RAID_ATTRS=m
-CONFIG_RAMOOPS=m
 CONFIG_RAPIDIO=y
 CONFIG_RAPIDIO_CPS_GEN2=y
 CONFIG_RAPIDIO_CPS_XX=y
 # CONFIG_RAPIDIO_DEBUG is not set
 CONFIG_RAPIDIO_DISC_TIMEOUT=30
+CONFIG_RAPIDIO_DMA_ENGINE=y
 # CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
 CONFIG_RAPIDIO_TSI500=y
 CONFIG_RAPIDIO_TSI568=y
@@ -4270,6 +4347,7 @@ CONFIG_RAW_DRIVER=m
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_CPU_STALL_VERBOSE=y
 # CONFIG_RCU_FANOUT_EXACT is not set
+CONFIG_RCU_FANOUT_LEAF=16
 CONFIG_RCU_FAST_NO_HZ=y
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_RCU_TRACE is not set
@@ -4286,9 +4364,10 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
 CONFIG_RD_XZ=y
+# CONFIG_READABLE_ASM is not set
 CONFIG_REALTEK_AUTOPM=y
 CONFIG_REALTEK_PHY=y
-CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_REED_SOLOMON_DEC8=y
 CONFIG_REED_SOLOMON_ENC8=y
@@ -4300,7 +4379,6 @@ CONFIG_REGULATOR=y
 CONFIG_REGULATOR_88PM8607=y
 CONFIG_REGULATOR_AAT2870=m
 CONFIG_REGULATOR_AB3100=m
-CONFIG_REGULATOR_AB8500=y
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_DA903X=m
 CONFIG_REGULATOR_DA9052=m
@@ -4319,13 +4397,16 @@ CONFIG_REGULATOR_MAX8998=m
 CONFIG_REGULATOR_MC13783=m
 CONFIG_REGULATOR_MC13892=m
 CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_PALMAS=m
 # CONFIG_REGULATOR_PCAP is not set
 CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_RC5T583=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_REGULATOR_TPS6105X=m
 CONFIG_REGULATOR_TPS62360=m
 CONFIG_REGULATOR_TPS65023=m
 CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65090=m
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_REGULATOR_TPS6524X=m
 CONFIG_REGULATOR_TPS6586X=m
@@ -4393,7 +4474,6 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
 CONFIG_RTC_DRV_88PM860X=m
 CONFIG_RTC_DRV_AB3100=m
-CONFIG_RTC_DRV_AB8500=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_DA9052=m
@@ -4507,6 +4587,7 @@ CONFIG_SBE_2T3E3=m
 CONFIG_SBE_PMCC4_NCOMM=y
 CONFIG_SBNI=m
 # CONFIG_SBNI_MULTILINE is not set
+# CONFIG_SBP_TARGET is not set
 CONFIG_SC1200_WDT=m
 CONFIG_SC520_WDT=m
 CONFIG_SC92031=m
@@ -4560,7 +4641,6 @@ CONFIG_SCSI_EATA_TAGGED_QUEUE=y
 CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_FC_ATTRS=m
 CONFIG_SCSI_FC_TGT_ATTRS=y
-CONFIG_SCSI_FD_MCS=m
 # CONFIG_SCSI_FLASHPOINT is not set
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
@@ -4569,7 +4649,6 @@ CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
 CONFIG_SCSI_GENERIC_NCR53C400=y
 CONFIG_SCSI_HPSA=m
 CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_IBMMCA=m
 CONFIG_SCSI_IBMVFC=m
 CONFIG_SCSI_IBMVFC_TRACE=y
 CONFIG_SCSI_IBMVSCSI=m
@@ -4603,11 +4682,6 @@ CONFIG_SCSI_MVSAS_DEBUG=y
 # CONFIG_SCSI_MVSAS_TASKLET is not set
 CONFIG_SCSI_MVUMI=m
 CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
-CONFIG_SCSI_NCR53C8XX_MAX_TAGS=4
-CONFIG_SCSI_NCR53C8XX_SYNC=5
-CONFIG_SCSI_NCR_D700=m
-CONFIG_SCSI_NCR_Q720=m
 CONFIG_SCSI_NETLINK=y
 CONFIG_SCSI_NSP32=m
 # CONFIG_SCSI_OSD_DEBUG is not set
@@ -4742,7 +4816,9 @@ CONFIG_SENSORS_HMC5843=m
 CONFIG_SENSORS_I5K_AMB=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
 CONFIG_SENSORS_K10TEMP=m
@@ -4821,12 +4897,12 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_CS=m
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_EM=m
 CONFIG_SERIAL_8250_EXAR_ST16C554=m
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_FOURPORT=m
 CONFIG_SERIAL_8250_HUB6=m
 CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_MCA=m
 CONFIG_SERIAL_8250_NR_UARTS=48
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_RSA=y
@@ -4841,6 +4917,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_ICOM=m
 # CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_IPOCTAL=m
 CONFIG_SERIAL_JSM=m
 CONFIG_SERIAL_MAX3100=m
 CONFIG_SERIAL_MAX3107=m
@@ -4883,7 +4960,6 @@ CONFIG_SKFP=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
 CONFIG_SKGE_GENESIS=y
-CONFIG_SKISA=m
 CONFIG_SKY2=m
 # CONFIG_SKY2_DEBUG is not set
 # CONFIG_SLAB is not set
@@ -4903,7 +4979,6 @@ CONFIG_SMARTJOYPLUS_FF=y
 CONFIG_SMC911X=m
 CONFIG_SMC9194=m
 CONFIG_SMC91X=m
-CONFIG_SMCTR=m
 CONFIG_SMC_IRCC_FIR=m
 CONFIG_SMP=y
 CONFIG_SMP_ON_UP=y
@@ -5104,6 +5179,7 @@ CONFIG_SND_SEQUENCER=m
 CONFIG_SND_SEQ_DUMMY=m
 CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIS7019=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_88PM860X=m
@@ -5124,6 +5200,7 @@ CONFIG_SND_SOC_ALL_CODECS=m
 CONFIG_SND_SOC_CS4270=m
 CONFIG_SND_SOC_CS4271=m
 CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L52=m
 CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_DA7210=m
@@ -5132,11 +5209,14 @@ CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_JZ4740_CODEC=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_LM4857=m
+CONFIG_SND_SOC_LM49453=m
 CONFIG_SND_SOC_MAX9768=m
 CONFIG_SND_SOC_MAX98088=m
 CONFIG_SND_SOC_MAX98095=m
 CONFIG_SND_SOC_MAX9850=m
 CONFIG_SND_SOC_MAX9877=m
+CONFIG_SND_SOC_MC13783=m
+CONFIG_SND_SOC_ML26124=m
 CONFIG_SND_SOC_PCM3008=m
 CONFIG_SND_SOC_RT5631=m
 CONFIG_SND_SOC_SGTL5000=m
@@ -5228,6 +5308,7 @@ CONFIG_SND_VX_LIB=m
 CONFIG_SND_WAVEFRONT=m
 CONFIG_SND_WSS_LIB=m
 CONFIG_SND_YMFPCI=m
+CONFIG_SOC_AM33XX=y
 CONFIG_SOC_CAMERA=m
 CONFIG_SOC_CAMERA_IMX074=m
 CONFIG_SOC_CAMERA_MT9M001=m
@@ -5245,8 +5326,7 @@ CONFIG_SOC_CAMERA_PLATFORM=m
 CONFIG_SOC_CAMERA_RJ54N1=m
 CONFIG_SOC_CAMERA_TW9910=m
 CONFIG_SOC_OMAP3430=y
-CONFIG_SOC_OMAPAM33XX=y
-CONFIG_SOC_OMAPTI81XX=y
+CONFIG_SOC_TI81XX=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOLO6X10=m
 CONFIG_SONYPI=m
@@ -5395,6 +5475,7 @@ CONFIG_TCM_FC=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_PSCSI=m
+CONFIG_TCM_QLA2XXX=m
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
 CONFIG_TCP_CONG_HSTCP=m
@@ -5447,14 +5528,13 @@ CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_CPDMA=m
 # CONFIG_TI_DAVINCI_EMAC is not set
 CONFIG_TI_DAVINCI_MDIO=m
+CONFIG_TI_EMIF=m
 CONFIG_TI_ST=m
 CONFIG_TLAN=m
 CONFIG_TMD_HERMES=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
 CONFIG_TOIM3232_DONGLE=m
 CONFIG_TOPSTAR_LAPTOP=m
 # CONFIG_TOSHIBA is not set
@@ -5475,6 +5555,7 @@ CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
 CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
 CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
 CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_EETI=m
 CONFIG_TOUCHSCREEN_EGALAX=m
@@ -5525,6 +5606,7 @@ CONFIG_TOUCHSCREEN_USB_JASTEC=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_USB_PANJIT=y
 CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WM831X=m
 CONFIG_TOUCHSCREEN_WM9705=y
@@ -5534,7 +5616,6 @@ CONFIG_TOUCHSCREEN_WM97XX=m
 CONFIG_TPS6105X=m
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
-CONFIG_TR=y
 CONFIG_TRACEPOINTS=y
 CONFIG_TRACER_MAX_TRACE=y
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -5551,6 +5632,7 @@ CONFIG_TREE_RCU=y
 # CONFIG_TREE_RCU_TRACE is not set
 CONFIG_TRUSTED_KEYS=y
 CONFIG_TSL2583=m
+CONFIG_TSL2x7x=m
 CONFIG_TTPCI_EEPROM=m
 CONFIG_TTY_PRINTK=y
 CONFIG_TULIP=m
@@ -5568,9 +5650,7 @@ CONFIG_U3_DART=y
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 CONFIG_UBIFS_FS=m
 # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-# CONFIG_UBIFS_FS_DEBUG is not set
 CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UCB1400_CORE=m
 CONFIG_UDBG_RTAS_CONSOLE=y
@@ -5592,11 +5672,12 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_ULI526X=m
 CONFIG_ULTRA=m
 CONFIG_ULTRA32=m
-CONFIG_ULTRAMCA=m
 CONFIG_UNINLINE_SPIN_UNLOCK=y
 CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=m
+CONFIG_UPROBES=y
+CONFIG_UPROBE_EVENT=y
 CONFIG_USB=y
 CONFIG_USBIP_CORE=m
 # CONFIG_USBIP_DEBUG is not set
@@ -5619,14 +5700,15 @@ CONFIG_USB_C67X00_HCD=m
 CONFIG_USB_CATC=m
 CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_USB_CDC_PHONET=m
-CONFIG_USB_CI13XXX_PCI=m
+CONFIG_USB_CHIPIDEA=m
+# CONFIG_USB_CHIPIDEA_DEBUG is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_CXACRU=m
 CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_USB_CYTHERM=m
 # CONFIG_USB_DEBUG is not set
-# CONFIG_USB_DEVICEFS is not set
-# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_DSBR=m
 # CONFIG_USB_DUMMY_HCD is not set
 # CONFIG_USB_DWC3_DEBUG is not set
@@ -5662,6 +5744,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_GADGET_SUPERSPEED=y
+CONFIG_USB_GADGET_TARGET=m
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GL860=m
 CONFIG_USB_GOKU=m
@@ -5721,6 +5804,8 @@ CONFIG_USB_G_NOKIA=m
 CONFIG_USB_G_PRINTER=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_USB_G_WEBCAM=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
 CONFIG_USB_HID=m
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_HSO=m
@@ -5732,13 +5817,13 @@ CONFIG_USB_IPHETH=m
 CONFIG_USB_IRDA=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1301=m
 CONFIG_USB_ISP1362_HCD=m
 CONFIG_USB_ISP1760_HCD=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_KBD=m
 CONFIG_USB_KC2190=y
 CONFIG_USB_KEENE=m
-CONFIG_USB_LANGWELL=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LED=m
@@ -5851,9 +5936,9 @@ CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OTI6858=m
 CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_QUALCOMM=m
 CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
@@ -5926,7 +6011,6 @@ CONFIG_USB_ZD1201=m
 CONFIG_USB_ZERO=m
 # CONFIG_USB_ZERO_HNPTEST is not set
 CONFIG_USB_ZR364XX=m
-CONFIG_USER_NS=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
@@ -6011,7 +6095,7 @@ CONFIG_VIDEO_DT3155=m
 CONFIG_VIDEO_EM28XX=m
 CONFIG_VIDEO_EM28XX_ALSA=m
 CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=y
+CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_VIDEO_FB_IVTV=m
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_GO7007=m
@@ -6105,6 +6189,7 @@ CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIRTIO_CONSOLE=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTUALIZATION=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_VIRT_TO_BUS=y
@@ -6160,7 +6245,6 @@ CONFIG_W83697UG_WDT=m
 CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_WAFER_WDT=m
-CONFIG_WANT_LLC=y
 CONFIG_WANXL=m
 CONFIG_WAN_ROUTER=m
 CONFIG_WAN_ROUTER_DRIVERS=m
@@ -6176,6 +6260,13 @@ CONFIG_WEXT_PROC=y
 CONFIG_WEXT_SPY=y
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_QOS=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB=y
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 CONFIG_WIMAX_IWMC3200_SDIO=y
@@ -6184,22 +6275,30 @@ CONFIG_WINBOND_FIR=m
 CONFIG_WINDFARM=m
 CONFIG_WINDFARM_PM112=m
 CONFIG_WINDFARM_PM121=m
+CONFIG_WINDFARM_PM72=m
 CONFIG_WINDFARM_PM81=m
 CONFIG_WINDFARM_PM91=m
+CONFIG_WINDFARM_RM31=m
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_EXT=y
 CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_WIZNET_BUS_ANY=y
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL12XX=m
-CONFIG_WL12XX_MENU=m
 CONFIG_WL12XX_PLATFORM_DATA=y
-CONFIG_WL12XX_SDIO=m
-CONFIG_WL12XX_SPI=m
 CONFIG_WLAGS49_H2=m
 CONFIG_WLAGS49_H25=m
 CONFIG_WLAN=y
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WLCORE_SPI=m
+CONFIG_WL_TI=y
 CONFIG_WM831X_BACKUP=m
 CONFIG_WM831X_POWER=m
 CONFIG_WM831X_WATCHDOG=m
@@ -6226,6 +6325,7 @@ CONFIG_X86_CPUFREQ_NFORCE2=y
 CONFIG_X86_CPUID=m
 CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_X86_EXTENDED_PLATFORM=y
 # CONFIG_X86_E_POWERSAVER is not set
 CONFIG_X86_GENERIC=y
@@ -6315,6 +6415,7 @@ CONFIG_XEN_TMEM=y
 CONFIG_XEN_WDT=m
 CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_IPCOMP=m
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 1295b1c966b..e664595fe40 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -75,7 +75,6 @@ CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HARDLOCKUP_DETECTOR=y
@@ -83,7 +82,6 @@ CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
-CONFIG_HIGHMEM=y
 CONFIG_HTC_I2CPLD=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_HZ=250
@@ -119,13 +117,11 @@ CONFIG_KEXEC=y
 CONFIG_KGDB=y
 CONFIG_KPROBES=y
 CONFIG_KSM=y
-CONFIG_KTIME_SCALAR=y
 CONFIG_LATENCYTOP=y
 CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_LIBERTAS_MESH=y
 CONFIG_LIBIPW_DEBUG=y
-CONFIG_LLC=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -189,7 +185,6 @@ CONFIG_PARPORT_1284=y
 CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=y
 CONFIG_PCCARD=m
-CONFIG_PERF_COUNTERS=y
 CONFIG_PHYSICAL_START=0x1000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
@@ -197,7 +192,7 @@ CONFIG_PMIC_DA903X=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PM_WAKELOCKS=y
 CONFIG_PPP_FILTER=y
 CONFIG_PPP_MULTILINK=y
 # CONFIG_PREEMPT is not set
@@ -273,7 +268,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_ET61X251=m
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_G_MULTI is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 783f21d0d1b..e29f1563f41 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -65,7 +65,6 @@ CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TWL4030=m
 CONFIG_HAMRADIO=y
@@ -73,7 +72,6 @@ CONFIG_HAMRADIO=y
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HIDRAW=y
-CONFIG_HIGHMEM=y
 CONFIG_HTC_I2CPLD=y
 # CONFIG_HVC_CONSOLE is not set
 CONFIG_HZ=250
@@ -112,7 +110,6 @@ CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_LIBERTAS_MESH=y
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LLC=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -176,14 +173,13 @@ CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
 CONFIG_PCI_SYSCALL=y
-CONFIG_PERF_COUNTERS=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PMIC_ADP5520=y
 CONFIG_PMIC_DA903X=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
-CONFIG_POWER_SUPPLY=y
+CONFIG_PM_WAKELOCKS=y
 CONFIG_PPC_4K_PAGES=y
 # CONFIG_PPC_64K_PAGES is not set
 # CONFIG_PPC_SMLPAR is not set
@@ -264,7 +260,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_ET61X251=m
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_G_MULTI is not set
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index e9db4171b16..a3d7b76e86c 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -75,7 +75,6 @@ CONFIG_FIRMWARE_EDID=y
 CONFIG_FORCE_MAX_ZONEORDER=9
 CONFIG_FTRACE=y
 CONFIG_FUNCTION_TRACER=y
-CONFIG_GENERIC_TIME_VSYSCALL=y
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TWL4030=m
 CONFIG_HAMRADIO=y
@@ -125,7 +124,6 @@ CONFIG_LDM_PARTITION=y
 CONFIG_LEGACY_PTY_COUNT=0
 CONFIG_LIBERTAS_MESH=y
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_LLC=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -196,7 +194,6 @@ CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_SIS=m
 CONFIG_PCCARD=m
 CONFIG_PCI_SYSCALL=y
-CONFIG_PERF_COUNTERS=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMIC_ADP5520=y
@@ -204,7 +201,7 @@ CONFIG_PMIC_DA903X=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_RUNTIME=y
-CONFIG_POWER_SUPPLY=m
+CONFIG_PM_WAKELOCKS=y
 CONFIG_PPC64=y
 # CONFIG_PPC_4K_PAGES is not set
 CONFIG_PPC_64K_PAGES=y
@@ -298,7 +295,6 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_DWC3=m
 CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_ET61X251=m
 CONFIG_USB_GADGET=m
 CONFIG_USB_GPIO_VBUS=m
 # CONFIG_USB_G_MULTI is not set