diff --git a/config-generic b/config-generic
index 59240de25..ed76596e5 100644
--- a/config-generic
+++ b/config-generic
@@ -52,6 +52,7 @@ CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_CFQ=y
+# FIXME: Is there any benefit in enabling all this namespace crap ?
 CONFIG_USER_NS=y
 CONFIG_PID_NS=y
 CONFIG_UTS_NS=y
@@ -110,6 +111,7 @@ CONFIG_ISA=y
 
 #
 # PCMCIA/CardBus support
+# FIXME: Deprecate Cardbus ?
 #
 CONFIG_PCMCIA=y
 CONFIG_PCMCIA_LOAD_CIS=y
@@ -356,6 +358,7 @@ CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
 CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_DRBD=m
 CONFIG_BLK_DEV_UMEM=m
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
@@ -504,15 +507,13 @@ CONFIG_SCSI_3W_9XXX=m
 CONFIG_SCSI_ACARD=m
 CONFIG_SCSI_AACRAID=m
 CONFIG_SCSI_AIC7XXX=m
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
 CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
 CONFIG_AIC7XXX_RESET_DELAY_MS=15000
 # CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
 # CONFIG_AIC7XXX_DEBUG_ENABLE is not set
 CONFIG_AIC7XXX_DEBUG_MASK=0
 # CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC7XXX_OLD=m
 CONFIG_SCSI_AIC79XX=m
 CONFIG_AIC79XX_CMDS_PER_DEVICE=4
 CONFIG_AIC79XX_RESET_DELAY_MS=15000
@@ -520,6 +521,8 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
 # CONFIG_SCSI_ADVANSYS is not set
 CONFIG_SCSI_BFA_FC=m
 CONFIG_MEGARAID_NEWGEN=y
@@ -759,6 +762,8 @@ CONFIG_FIREWIRE_NOSY=m
 #
 CONFIG_NET=y
 
+CONFIG_NET_DMA=y
+
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_CONG_BIC=m
 CONFIG_TCP_CONG_CUBIC=y
@@ -823,6 +828,7 @@ CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_PROTO_ESP=y
 CONFIG_IP_VS_PROTO_AH=y
 CONFIG_IP_VS_PROTO_SCTP=y
+CONFIG_IP_VS_IPV6=y
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m
@@ -867,21 +873,31 @@ CONFIG_NET_9P_RDMA=m
 # CONFIG_DECNET is not set
 CONFIG_BRIDGE=m
 CONFIG_BRIDGE_IGMP_SNOOPING=y
+
+# PHY timestamping adds overhead
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
+
 CONFIG_NETFILTER=y
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_NF_CONNTRACK=m
 CONFIG_NETFILTER_NETLINK=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XT_SET=m
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_CONNMARK=m
+
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
@@ -892,24 +908,31 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
 CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
 CONFIG_NETFILTER_XT_MATCH_LIMIT=m
 CONFIG_NETFILTER_XT_MATCH_MAC=m
 CONFIG_NETFILTER_XT_MATCH_MARK=m
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
@@ -917,23 +940,15 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
 CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_MATCH_CPU=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_TARGET_AUDIT=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_BRIDGE_NETFILTER=y
@@ -1124,6 +1139,7 @@ CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_CLS=y
@@ -1149,6 +1165,7 @@ CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_EMATCH_U32=m
 
+CONFIG_NET_ACT_CSUM=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_IPT=m
@@ -1157,7 +1174,7 @@ CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_SKBEDIT=m
 
 CONFIG_DCB=y
 
@@ -1240,8 +1257,6 @@ CONFIG_L2TP_ETH=m
 CONFIG_RFKILL=m
 CONFIG_RFKILL_INPUT=y
 
-CONFIG_NFC_NCI=m
-
 #
 # Ethernet (10 or 100Mbit)
 #
@@ -1687,15 +1702,6 @@ CONFIG_MWIFIEX_PCIE=m
 # Token Ring devices
 #
 # CONFIG_TR is not set
-# CONFIG_IBMOL is not set
-# CONFIG_3C359 is not set
-# Broken with gcc4.1
-# CONFIG_TMS380TR is not set
-# CONFIG_TMSPCI is not set
-# CONFIG_ABYSS is not set
-# CONFIG_IBMLS is not set
-# CONFIG_PCMCIA_IBMTR is not set
-
 
 CONFIG_NET_FC=y
 
@@ -1718,30 +1724,9 @@ CONFIG_PCMCIA_FMVJ18X=m
 CONFIG_HAMRADIO=y
 CONFIG_AX25=m
 CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_GW=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
-CONFIG_CAN_SJA1000=m
-CONFIG_CAN_SJA1000_ISA=m
-CONFIG_CAN_SJA1000_PLATFORM=m
-CONFIG_CAN_EMS_PCMCIA=m
-CONFIG_CAN_EMS_PCI=m
-CONFIG_CAN_PEAK_PCI=m
-CONFIG_CAN_EMS_USB=m
-CONFIG_CAN_ESD_USB2=m
-CONFIG_CAN_KVASER_PCI=m
-CONFIG_CAN_PLX_PCI=m
-CONFIG_CAN_TSCAN1=m
-CONFIG_CAN_SLCAN=m
-CONFIG_CAN_SOFTING=m
-CONFIG_CAN_SOFTING_CS=m
-CONFIG_CAN_C_CAN=m
-CONFIG_CAN_C_CAN_PLATFORM=m
-# CONFIG_PCH_CAN is not set
+
+# CONFIG_CAN is not set
+
 CONFIG_NETROM=m
 CONFIG_ROSE=m
 CONFIG_MKISS=m
@@ -1758,6 +1743,10 @@ CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
 
 CONFIG_NFC=m
+CONFIG_PN544_NFC=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_NCI=m
 
 #
 # IrDA (infrared) support
@@ -2434,6 +2423,7 @@ CONFIG_MACHZ_WDT=m
 # CONFIG_SC520_WDT is not set
 CONFIG_ALIM7101_WDT=m
 CONFIG_ALIM1535_WDT=m
+CONFIG_IT87_WDT=m
 CONFIG_ITCO_WDT=m
 CONFIG_ITCO_VENDOR_SUPPORT=y
 # CONFIG_SC1200_WDT is not set
@@ -2447,12 +2437,15 @@ CONFIG_IT8712F_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_PCIPCWATCHDOG=m
+# CONFIG_PCWATCHDOG is not set
 CONFIG_USBPCWATCHDOG=m
 # CONFIG_SBC_EPX_C3_WATCHDOG is not set
 CONFIG_WM8350_WATCHDOG=m
 CONFIG_WM831X_WATCHDOG=m
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
+CONFIG_W83697UG_WDT=m
+# CONFIG_WDT is not set
 
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -2469,6 +2462,7 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1511=m
 CONFIG_RTC_DRV_DS1553=m
 CONFIG_RTC_DRV_DS1672=m
 CONFIG_RTC_DRV_DS1742=m
@@ -2523,9 +2517,12 @@ CONFIG_AGP_SIS=y
 CONFIG_AGP_SWORKS=y
 CONFIG_AGP_VIA=y
 CONFIG_AGP_EFFICEON=y
+
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
+
 # CONFIG_STUB_POULSBO is not set
+
 CONFIG_DRM=m
 # CONFIG_DRM_TDFX is not set
 # CONFIG_DRM_R128 is not set
@@ -2541,6 +2538,10 @@ CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
 CONFIG_DRM_NOUVEAU_DEBUG=y
+CONFIG_DRM_PSB=m
+# CONFIG_DRM_PSB_MRST is not set
+# CONFIG_DRM_PSB_MFLD is not set
+# CONFIG_DRM_PSB_CDV is not set
 CONFIG_DRM_I2C_CH7006=m
 CONFIG_DRM_I2C_SIL164=m
 CONFIG_DRM_VMWGFX=m
@@ -2612,6 +2613,7 @@ CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PMS is not set
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134=m
@@ -2861,7 +2863,9 @@ CONFIG_IR_ITE_CIR=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_REDRAT3=m
-
+CONFIG_IR_ENE=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
 
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 # CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
@@ -2943,6 +2947,7 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_PRE_INIT_FB is not set
 # CONFIG_FB_TMIO is not set
 # CONFIG_FB_BROADSHEET is not set
+CONFIG_FB_UDL=m
 
 # CONFIG_FIRMWARE_EDID is not set
 
@@ -3441,6 +3446,7 @@ CONFIG_USB_SERIAL_OTI6858=m
 CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_QUATECH2 is not set
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
@@ -3563,6 +3569,11 @@ CONFIG_MFD_WM8400=m
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_WM831X_I2C is not set
 # CONFIG_MFD_CS5535 is not set
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TC3589X is not set
+# CONFIG_MFD_WL1273_CORE is not set
 
 #
 # File systems
@@ -3857,24 +3868,68 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 # CONFIG_DEBUG_DRIVER is not set
 CONFIG_HEADERS_CHECK=y
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_TRACE is not set
 # CONFIG_LKDTM is not set
 
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_LOCKDEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 
+# DEBUG options that don't get enabled/disabled with 'make debug/release'
+#
+# Kmemleak still produces a lot of false positives.
+# CONFIG_DEBUG_KMEMLEAK is not set
+#
+# This generates a huge amount of dmesg spew
+# CONFIG_DEBUG_KOBJECT is not set
+#
+#
+# These debug options are deliberatly left on (even in 'make release' kernels).
+# They aren't that much of a performance impact, and the value
+# from getting useful bug-reports makes it worth leaving them on.
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DEBUG_DEVRES=y
+CONFIG_DEBUG_RODATA_TEST=y
+CONFIG_DEBUG_NX_TEST=m
+CONFIG_DEBUG_SET_MODULE_RONX=y
+CONFIG_DEBUG_BOOT_PARAMS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_ATOMIC64_SELFTEST=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+CONFIG_LATENCYTOP=y
+CONFIG_RESOURCE_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_CRASH is not set
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_RAMOOPS is not set
+
 CONFIG_KGDB=y
 CONFIG_KGDB_SERIAL_CONSOLE=y
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 
+
 #
 # Security options
 #
 CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
@@ -3886,6 +3941,7 @@ CONFIG_SECURITY_SELINUX_DEVELOP=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_AVC_STATS=y
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@@ -3975,6 +4031,7 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC_T10DIF=m
 CONFIG_CRC8=m
+# CONFIG_CRC7 is not set
 CONFIG_CORDIC=m
 
 CONFIG_CRYPTO_ZLIB=m
@@ -4044,6 +4101,8 @@ CONFIG_KEXEC=y
 
 CONFIG_HWMON=y
 # CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_THERMAL_HWMON=y
+
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 
@@ -4054,8 +4113,10 @@ CONFIG_IBMASR=m
 
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_PM_RUNTIME=y
+# CONFIG_PM_OPP is not set
 
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -4124,24 +4185,7 @@ CONFIG_NE2000=m
 # CONFIG_SERIAL_8250_HUB6 is not set
 # CONFIG_SERIAL_8250_EXAR_ST16C554 is not set
 
-# CONFIG_PCWATCHDOG is not set
-# CONFIG_WDT is not set
-
-# CONFIG_VIDEO_PMS is not set
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_RADIO_CADET is not set
-# CONFIG_RADIO_RTRACK is not set
-# CONFIG_RADIO_RTRACK2 is not set
-# CONFIG_RADIO_AZTECH is not set
-# CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_SF16FMI is not set
-# CONFIG_RADIO_SF16FMR2 is not set
-# CONFIG_RADIO_TERRATEC is not set
-# CONFIG_RADIO_TRUST is not set
-# CONFIG_RADIO_TEA5764 is not set
-# CONFIG_RADIO_TYPHOON is not set
-# CONFIG_RADIO_ZOLTRIX is not set
-# CONFIG_RADIO_SAA7706H is not set
+# CONFIG_RADIO_ADAPTERS is not set
 
 # CONFIG_SND_OPL4_LIB is not set
 # CONFIG_SND_AD1816A is not set
@@ -4206,22 +4250,22 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 CONFIG_LEDS_ALIX2=m
-CONFIG_LEDS_WM8350=m
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_REGULATOR=m
-CONFIG_LEDS_LT3593=m
-CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
-CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_WM831X_STATUS=m
 
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DW_DMAC=m
 # CONFIG_TIMB_DMA is not set
-CONFIG_NET_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_ASYNC_TX_DMA=y
 
@@ -4242,13 +4286,14 @@ CONFIG_FUNCTION_PROFILER=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 CONFIG_FUNCTION_TRACER=y
 CONFIG_STACK_TRACER=y
+# CONFIG_FUNCTION_GRAPH_TRACER is not set
 
 CONFIG_KPROBES=y
+CONFIG_KPROBE_EVENT=y
+# CONFIG_KPROBES_SANITY_TEST is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_OPTPROBES=y
 
-# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
-
 CONFIG_HZ_1000=y
 
 CONFIG_TIMER_STATS=y
@@ -4264,22 +4309,26 @@ CONFIG_CFAG12864B_RATE=20
 
 CONFIG_POWER_SUPPLY=m
 # CONFIG_POWER_SUPPLY_DEBUG is not set
+
 # CONFIG_TEST_POWER is not set
 CONFIG_APM_POWER=m
 # CONFIG_WM831X_POWER is not set
+
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_BQ20Z75 is not set
 # CONFIG_BATTERY_DS2780 is not set
-# CONFIG_CHARGER_ISP1704 is not set
-# CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
-# CONFIG_PDA_POWER is not set
-# CONFIG_CHARGER_GPIO is not set
 # CONFIG_BATTERY_MAX17042 is not set
+
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_PCF50633 is not set
 
+# CONFIG_PDA_POWER is not set
+
 CONFIG_AUXDISPLAY=y
 
 CONFIG_UIO=m
@@ -4291,7 +4340,6 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_NETX is not set
 
-# CONFIG_CRC7 is not set
 
 
 # LIRC
@@ -4311,29 +4359,17 @@ CONFIG_LIRC_TTUSBIR=m
 
 # CONFIG_DEVKMEM is not set
 
-CONFIG_PM_TRACE_RTC=y
-
 CONFIG_BNX2X=m
 CONFIG_SCSI_BNX2X_FCOE=m
 
 CONFIG_NOZOMI=m
 # CONFIG_TPS65010 is not set
-# CONFIG_DEBUG_SECTION_MISMATCH is not set
-# CONFIG_KPROBES_SANITY_TEST is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-CONFIG_LATENCYTOP=y
-CONFIG_RESOURCE_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
 
-
-#FIXME: x86 generic?
-CONFIG_LEDS_CLEVO_MAIL=m
 CONFIG_INPUT_APANEL=m
 
 # CONFIG_INTEL_MENLOW is not set
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_IPWIRELESS=m
-CONFIG_RTC_DRV_DS1511=m
 
 # CONFIG_BLK_DEV_XIP is not set
 CONFIG_MEMSTICK=m
@@ -4351,8 +4387,6 @@ CONFIG_A11Y_BRAILLE_CONSOLE=y
 
 # MT9V022_PCA9536_SWITCH is not set
 
-CONFIG_THERMAL_HWMON=y
-
 CONFIG_OPTIMIZE_INLINING=y
 
 # FIXME: This should be x86/ia64 only
@@ -4361,31 +4395,18 @@ CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_GPIOLIB is not set
 # CONFIG_PINCTRL is not set
 
-
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-
-CONFIG_IP_VS_IPV6=y
-
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6131=y
 CONFIG_NET_DSA_MV88E6123_61_65=y
 
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_ACT_SKBEDIT=m
+# Used by Maemo, we don't care.
+# CONFIG_PHONET is not set
 
-CONFIG_PHONET=m
+# CONFIG_ICS932S401 is not set
 
-CONFIG_ICS932S401=m
 # CONFIG_C2PORT is not set
 
-
-CONFIG_IT87_WDT=m
-CONFIG_W83697UG_WDT=m
-
 # CONFIG_REGULATOR is not set
 # CONFIG_REGULATOR_DEBUG is not set
 
@@ -4454,10 +4475,6 @@ CONFIG_USB_ATMEL=m
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_RTS_PSTOR is not set
-CONFIG_DRM_PSB=m
-# CONFIG_DRM_PSB_MRST is not set
-# CONFIG_DRM_PSB_MFLD is not set
-# CONFIG_DRM_PSB_CDV is not set
 CONFIG_ALTERA_STAPL=m
 # CONFIG_DVB_CXD2099 is not set
 # CONFIG_USBIP_CORE is not set
@@ -4465,17 +4482,9 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_ZCACHE is not set
 # CONFIG_RTS5139 is not set
 # CONFIG_NVEC_LEDS is not set
-
+# CONFIG_VT6655 is not set
 #
-# Android
-#
-
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_FUNCTION_GRAPH_TRACER is not set
-CONFIG_EARLY_PRINTK_DBGP=y
-
-CONFIG_SECURITYFS=y
+# END OF STAGING
 
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
@@ -4493,17 +4502,14 @@ CONFIG_IMA_LSM_RULES=y
 
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 
-# CONFIG_PAGE_POISONING is not set
-
-
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_CRASH is not set
-
 CONFIG_STRIP_ASM_SYMS=y
 
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_TRACE is not set
+CONFIG_SPARSE_RCU_POINTER=y
 
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -4517,8 +4523,6 @@ CONFIG_IEEE802154_6LOWPAN=m
 CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 
-# CONFIG_GCOV_KERNEL is not set
-
 CONFIG_PPS=m
 # CONFIG_PPS_CLIENT_KTIMER is not set
 CONFIG_PPS_CLIENT_LDISC=m
@@ -4530,45 +4534,8 @@ CONFIG_NTP_PPS=y
 
 CONFIG_PTP_1588_CLOCK=m
 
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-# CONFIG_VT6655 is not set
-CONFIG_FB_UDL=m
-
-# DEBUG options that don't get enabled/disabled with 'make debug/release'
-#
-# Kmemleak still produces a lot of false positives.
-# CONFIG_DEBUG_KMEMLEAK is not set
-#
-# This generates a huge amount of dmesg spew
-# CONFIG_DEBUG_KOBJECT is not set
-#
-#
-# These debug options are deliberatly left on (even in 'make release' kernels).
-# They aren't that much of a performance impact, and the value
-# from getting useful bug-reports makes it worth leaving them on.
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_HIGHMEM=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_DEBUG_DEVRES=y
-CONFIG_DEBUG_RODATA_TEST=y
-CONFIG_DEBUG_NX_TEST=m
-CONFIG_DEBUG_SET_MODULE_RONX=y
-CONFIG_DEBUG_BOOT_PARAMS=y
-# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-CONFIG_LOCKUP_DETECTOR=y
-# CONFIG_DEBUG_INFO_REDUCED is not set
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-CONFIG_ATOMIC64_SELFTEST=y
-
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
 CONFIG_CLEANCACHE=y
 
-CONFIG_BLK_DEV_DRBD=m
-
 # CONFIG_MDIO_GPIO is not set
 # CONFIG_KEYBOARD_GPIO is not set
 # CONFIG_KEYBOARD_GPIO_POLLED is not set
@@ -4598,33 +4565,14 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
 
-CONFIG_KPROBE_EVENT=y
-
-# CONFIG_RAMOOPS is not set
-
-CONFIG_IR_ENE=m
-CONFIG_IR_STREAMZAP=m
-CONFIG_IR_WINBOND_CIR=m
-
 # CONFIG_GPIO_SX150X is not set
-# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_MAX8998 is not set
-# CONFIG_MFD_TPS6586X is not set
-# CONFIG_MFD_TC3589X is not set
-
-CONFIG_SPARSE_RCU_POINTER=y
-
-# CONFIG_PM_OPP is not set
-
 
+# FIXME: Why?
 CONFIG_EVENT_POWER_TRACING_DEPRECATED=y
 
+CONFIG_TEST_KSTRTOX=m
 # CONFIG_XZ_DEC_TEST is not set
 
-CONFIG_PN544_NFC=m
-CONFIG_NFC_PN533=m
-CONFIG_NFC_WILINK=m
-
 CONFIG_TARGET_CORE=m
 CONFIG_ISCSI_TARGET=m
 CONFIG_LOOPBACK_TARGET=m
@@ -4643,8 +4591,6 @@ CONFIG_PSTORE=y
 
 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 
-CONFIG_TEST_KSTRTOX=m
-
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
@@ -4653,7 +4599,6 @@ CONFIG_BCMA_HOST_PCI=y
 
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_INTEL_MID_PTI=m
-
 CONFIG_IOMMU_SUPPORT=y
 
 # CONFIG_PM_DEVFREQ is not set