diff --git a/debian/changelog b/debian/changelog
index 15da27d30..cfb1c4c7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,11 @@ linux-2.6 (2.6.33~rc8-1~experimental.1) UNRELEASED; urgency=low
     DVB_FIREDTV, DVB_USB_EC168, SOC_CAMERA_MT9T112, SOC_CAMERA_OV9640,
     USB_GSPCA_PAC7302, USB_GSPCA_STV0680, AD525X_DPOT, CAN_MCP251X,
     RT2800PCI, REGULATOR_MAX8660, RTC_DRV_BQ32K, RTC_DRV_MSM6242,
-    RTC_DRV_RP5C01, VMWARE_PVSCSI, SCSI_PM8001.
-  * [x86] set CS5535_MFGPT.
+    RTC_DRV_RP5C01, VMWARE_PVSCSI, SCSI_PM8001, WIMAX_IWMC3200_SDIO,
+    INPUT_SPARSEKMAP, SERIO_ALTERA_PS2, MANTIS_CORE, DVB_MANTIS,
+    DVB_HOPPER.
+  * [x86] set CS5535_MFGPT, SENSORS_K10TEMP, GEODE_WDT, MSI_WMI,
+    TOSHIBA_BT_RFKILL, ACPI_CMPC, CRYPTO_GHASH_CLMUL_NI_INTE.
 
  -- maximilian attems <maks@debian.org>  Mon, 15 Feb 2010 23:54:52 +0200
 
diff --git a/debian/config/config b/debian/config/config
index 07bdfdd8a..a5a4b74ae 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -259,6 +259,11 @@ CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 
+##
+## file: drivers/clocksource/Kconfig
+##
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+
 ##
 ## file: drivers/connector/Kconfig
 ##
@@ -538,6 +543,7 @@ CONFIG_INFINIBAND_SRP=m
 CONFIG_INPUT=y
 CONFIG_INPUT_FF_MEMLESS=m
 # CONFIG_INPUT_POLLDEV is not set
+CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
@@ -615,6 +621,11 @@ CONFIG_MOUSE_PS2_SENTELIC=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_SYNAPTICS_I2C=m
 
+##
+## file: drivers/input/serio/Kconfig
+##
+CONFIG_SERIO_ALTERA_PS2=m
+
 ##
 ## file: drivers/input/touchscreen/Kconfig
 ##
@@ -708,7 +719,7 @@ CONFIG_LEDS_PCA955X=m
 CONFIG_LEDS_WM831X_STATUS=m
 CONFIG_LEDS_WM8350=m
 CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_REGULATOR=m
 CONFIG_LEDS_BD2802=m
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_TRIGGERS=y
@@ -881,6 +892,13 @@ CONFIG_DVB_ISL6421=m
 CONFIG_DVB_LGS8GXX=m
 CONFIG_DVB_DUMMY_FE=m
 
+##
+## file: drivers/media/dvb/mantis/Kconfig
+##
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+
 ##
 ## file: drivers/media/dvb/pluto2/Kconfig
 ##
@@ -1648,6 +1666,7 @@ CONFIG_WAN_ROUTER_DRIVERS=m
 ## file: drivers/net/wimax/i2400m/Kconfig
 ##
 CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_IWMC3200_SDIO=y
 CONFIG_WIMAX_I2400M_SDIO=m
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 
@@ -3907,6 +3926,7 @@ CONFIG_CFG80211=m
 CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 CONFIG_WIRELESS_OLD_REGULATORY=y
+CONFIG_CFG80211_WEXT=y
 CONFIG_WIRELESS_EXT=y
 # CONFIG_WIRELESS_EXT_SYSFS is not set
 CONFIG_LIB80211=m
@@ -4037,6 +4057,7 @@ CONFIG_SND_VIRTUOSO=m
 CONFIG_SND_HDA_HWDEP=y
 CONFIG_SND_HDA_RECONFIG=y
 CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
 CONFIG_SND_HDA_INPUT_JACK=y
 CONFIG_SND_HDA_PATCH_LOADER=y
 CONFIG_SND_HDA_CODEC_REALTEK=y
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 87798ea5d..601f14ded 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -115,6 +115,7 @@ CONFIG_XEN=y
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 
 ##
 ## file: drivers/acpi/Kconfig
@@ -382,6 +383,7 @@ CONFIG_SENSORS_ADM1025=m
 CONFIG_SENSORS_ADM1026=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
 CONFIG_SENSORS_F71805F=m
@@ -972,6 +974,7 @@ CONFIG_ACERHDF=m
 CONFIG_DELL_WMI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
 # CONFIG_THINKPAD_ACPI_DEBUG is not set
 # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
@@ -979,10 +982,13 @@ CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 # CONFIG_INTEL_MENLOW is not set
 CONFIG_EEEPC_LAPTOP=m
+CONFIG_MSI_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_ACPI_ASUS=m
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
 
 ##
 ## file: drivers/pnp/Kconfig
@@ -1245,6 +1251,7 @@ CONFIG_ACQUIRE_WDT=m
 CONFIG_ADVANTECH_WDT=m
 CONFIG_ALIM1535_WDT=m
 CONFIG_ALIM7101_WDT=m
+CONFIG_GEODE_WDT=m
 CONFIG_SC520_WDT=m
 CONFIG_EUROTECH_WDT=m
 CONFIG_IB700_WDT=m