diff --git a/core/kernel26/2.6.36.2.config b/core/kernel26/2.6.37.config
similarity index 94%
rename from core/kernel26/2.6.36.2.config
rename to core/kernel26/2.6.37.config
index eec5082dd..5fc233311 100644
--- a/core/kernel26/2.6.36.2.config
+++ b/core/kernel26/2.6.37.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36.1
-# Tue Nov 30 18:56:04 2010
+# Linux/arm 2.6.37 Kernel Configuration
+# Thu Jan 27 23:36:29 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -17,6 +17,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NEED_DMA_MAP_STATE=y
@@ -24,6 +25,8 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
 
 #
 # General setup
@@ -51,13 +54,16 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
+# CONFIG_HAVE_GENERIC_HARDIRQS is not set
+# CONFIG_SPARSE_IRQ is not set
 
 #
 # RCU Subsystem
 #
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
+CONFIG_TREE_PREEMPT_RCU=y
 # CONFIG_TINY_RCU is not set
+# CONFIG_TINY_PREEMPT_RCU is not set
+CONFIG_PREEMPT_RCU=y
 # CONFIG_RCU_TRACE is not set
 CONFIG_RCU_FANOUT=32
 # CONFIG_RCU_FANOUT_EXACT is not set
@@ -66,14 +72,14 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_IPC_NS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_RD_GZIP=y
@@ -233,12 +239,13 @@ CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P64X0 is not set
 # CONFIG_ARCH_S5P6442 is not set
 # CONFIG_ARCH_S5PC100 is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_S5PV310 is not set
 # CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_TCC_926 is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_U300 is not set
 # CONFIG_ARCH_U8500 is not set
@@ -256,9 +263,11 @@ CONFIG_MACH_RD88F6281=y
 CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_ESATA_SHEEVAPLUG=y
-CONFIG_MACH_GURUPLUG=y
+# CONFIG_MACH_GURUPLUG is not set
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
+CONFIG_MACH_DOCKSTAR=y
+CONFIG_MACH_GOFLEXNET=y
 CONFIG_MACH_OPENRD=y
 CONFIG_MACH_OPENRD_BASE=y
 CONFIG_MACH_OPENRD_CLIENT=y
@@ -266,6 +275,7 @@ CONFIG_MACH_OPENRD_ULTIMATE=y
 CONFIG_MACH_NETSPACE_V2=y
 CONFIG_MACH_INETSPACE_V2=y
 CONFIG_MACH_NETSPACE_MAX_V2=y
+CONFIG_MACH_D2NET_V2=y
 CONFIG_MACH_NET2BIG_V2=y
 CONFIG_MACH_NET5BIG_V2=y
 CONFIG_MACH_T5325=y
@@ -327,7 +337,6 @@ CONFIG_AEABI=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_HIGHMEM is not set
-# CONFIG_SPARSE_IRQ is not set
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FLATMEM=y
@@ -340,9 +349,11 @@ CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
 CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+CONFIG_NEED_PER_CPU_KM=y
 CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
+# CONFIG_SECCOMP is not set
 # CONFIG_CC_STACKPROTECTOR is not set
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 
@@ -429,8 +440,7 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 # CONFIG_IP_PNP_RARP is not set
 CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
 # CONFIG_IP_MROUTE is not set
 # CONFIG_ARPD is not set
 CONFIG_SYN_COOKIES=y
@@ -621,6 +631,7 @@ CONFIG_IP_NF_ARP_MANGLE=m
 #
 # IPv6: Netfilter Configuration
 #
+CONFIG_NF_DEFRAG_IPV6=m
 CONFIG_NF_CONNTRACK_IPV6=m
 # CONFIG_IP6_NF_QUEUE is not set
 CONFIG_IP6_NF_IPTABLES=m
@@ -749,6 +760,7 @@ CONFIG_NET_CLS_ACT=y
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_SIMP is not set
 # CONFIG_NET_ACT_SKBEDIT is not set
+# CONFIG_NET_ACT_CSUM is not set
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
@@ -900,6 +912,7 @@ CONFIG_RFKILL_INPUT=y
 CONFIG_CAIF=m
 # CONFIG_CAIF_DEBUG is not set
 CONFIG_CAIF_NETDEV=m
+# CONFIG_CEPH_LIB is not set
 
 #
 # Device Drivers
@@ -1025,10 +1038,6 @@ CONFIG_MTD_NAND_ORION=y
 # LPDDR flash memory drivers
 #
 # CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -1061,6 +1070,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_CDROM_PKTCDVD is not set
 CONFIG_ATA_OVER_ETH=m
 # CONFIG_MG_DISK is not set
+# CONFIG_BLK_DEV_RBD is not set
 CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 # CONFIG_AD525X_DPOT_I2C is not set
@@ -1072,13 +1082,18 @@ CONFIG_TIFM_7XX1=m
 CONFIG_ICS932S401=m
 CONFIG_ENCLOSURE_SERVICES=m
 CONFIG_HP_ILO=m
+# CONFIG_APDS9802ALS is not set
 CONFIG_ISL29003=m
+# CONFIG_ISL29020 is not set
 CONFIG_SENSORS_TSL2550=m
 CONFIG_SENSORS_BH1780=m
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_TI_DAC7512=m
 CONFIG_BMP085=m
+# CONFIG_PCH_PHUB is not set
 CONFIG_C2PORT=m
 
 #
@@ -1095,6 +1110,11 @@ CONFIG_CB710_DEBUG_ASSUMPTIONS=y
 CONFIG_IWMC3200TOP=m
 # CONFIG_IWMC3200TOP_DEBUG is not set
 # CONFIG_IWMC3200TOP_DEBUGFS is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1132,12 +1152,14 @@ CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_SAS_ATTRS is not set
 # CONFIG_SCSI_SAS_LIBSAS is not set
 # CONFIG_SCSI_SRP_ATTRS is not set
 CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ISCSI_TCP=m
 CONFIG_ISCSI_BOOT_SYSFS=m
 # CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
 # CONFIG_SCSI_BNX2_ISCSI is not set
 # CONFIG_BE2ISCSI is not set
 # CONFIG_BLK_DEV_3W_XXXX_RAID is not set
@@ -1231,6 +1253,7 @@ CONFIG_SATA_VIA=m
 # CONFIG_PATA_CMD64X is not set
 # CONFIG_PATA_CS5520 is not set
 # CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CS5536 is not set
 # CONFIG_PATA_CYPRESS is not set
 # CONFIG_PATA_EFAR is not set
 # CONFIG_PATA_HPT366 is not set
@@ -1300,16 +1323,7 @@ CONFIG_DM_MULTIPATH=m
 #
 # IEEE 1394 (FireWire) support
 #
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# The newer stack is recommended.
-#
 # CONFIG_FIREWIRE is not set
-# CONFIG_IEEE1394 is not set
 # CONFIG_FIREWIRE_NOSY is not set
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
@@ -1329,6 +1343,7 @@ CONFIG_MACVTAP=m
 CONFIG_TUN=m
 CONFIG_VETH=m
 # CONFIG_ARCNET is not set
+CONFIG_MII=y
 CONFIG_PHYLIB=y
 
 #
@@ -1342,6 +1357,7 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_VITESSE_PHY is not set
 # CONFIG_SMSC_PHY is not set
 # CONFIG_BROADCOM_PHY is not set
+CONFIG_BCM63XX_PHY=y
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_REALTEK_PHY is not set
 # CONFIG_NATIONAL_PHY is not set
@@ -1351,7 +1367,6 @@ CONFIG_MARVELL_PHY=y
 # CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
 # CONFIG_AX88796 is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_SUNGEM is not set
@@ -1423,6 +1438,8 @@ CONFIG_MV643XX_ETH=y
 # CONFIG_ATL1E is not set
 # CONFIG_ATL1C is not set
 # CONFIG_JME is not set
+# CONFIG_STMMAC_ETH is not set
+CONFIG_PCH_GBE=y
 CONFIG_NETDEV_10000=y
 CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
@@ -1449,6 +1466,7 @@ CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
 CONFIG_QLCNIC=m
 CONFIG_QLGE=m
+# CONFIG_BNA is not set
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
 CONFIG_BE2NET=m
@@ -1476,10 +1494,12 @@ CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
 # CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
 CONFIG_AR9170_USB=m
 CONFIG_AR9170_LEDS=y
+# CONFIG_CARL9170 is not set
 CONFIG_B43=m
 CONFIG_B43_PCI_AUTOSELECT=y
 CONFIG_B43_PCICORE_AUTOSELECT=y
@@ -1500,6 +1520,10 @@ CONFIG_IPW2200_QOS=y
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_IWLWIFI=m
+
+#
+# Debugging Options
+#
 # CONFIG_IWLWIFI_DEBUG is not set
 # CONFIG_IWLWIFI_DEVICE_TRACING is not set
 # CONFIG_IWLAGN is not set
@@ -1523,6 +1547,7 @@ CONFIG_P54_COMMON=m
 CONFIG_P54_USB=m
 CONFIG_P54_PCI=m
 CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
 CONFIG_P54_LEDS=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@@ -1547,13 +1572,14 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL12XX=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
 CONFIG_WL1271=m
 CONFIG_WL1271_SPI=m
 CONFIG_WL1271_SDIO=m
+CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 
@@ -1593,6 +1619,7 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
+# CONFIG_USB_NET_CX82310_ETH is not set
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_IPHETH=m
@@ -1659,6 +1686,7 @@ CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=y
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
 CONFIG_KEYBOARD_TCA6416=m
 # CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
@@ -1689,6 +1717,7 @@ CONFIG_INPUT_TABLET=y
 # CONFIG_TABLET_USB_ACECAD is not set
 # CONFIG_TABLET_USB_AIPTEK is not set
 # CONFIG_TABLET_USB_GTCO is not set
+# CONFIG_TABLET_USB_HANWANG is not set
 # CONFIG_TABLET_USB_KBTAB is not set
 CONFIG_TABLET_USB_WACOM=m
 CONFIG_INPUT_TOUCHSCREEN=y
@@ -1697,6 +1726,7 @@ CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_BU21013=y
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
@@ -1744,6 +1774,7 @@ CONFIG_SERIO_SERPORT=y
 CONFIG_SERIO_LIBPS2=y
 # CONFIG_SERIO_RAW is not set
 # CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
 # CONFIG_GAMEPORT is not set
 
 #
@@ -1827,6 +1858,7 @@ CONFIG_I2C_ALGOBIT=m
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
 # CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_INTEL_MID is not set
 CONFIG_I2C_MV64XXX=y
 # CONFIG_I2C_OCORES is not set
 # CONFIG_I2C_PCA_PLATFORM is not set
@@ -1857,6 +1889,7 @@ CONFIG_SPI_MASTER=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_GPIO is not set
 CONFIG_SPI_ORION=y
+# CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XILINX is not set
 # CONFIG_SPI_DESIGNWARE is not set
 
@@ -1878,8 +1911,10 @@ CONFIG_GPIOLIB=y
 #
 # Memory mapped GPIO expanders:
 #
+# CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_SCH is not set
+# CONFIG_GPIO_VX855 is not set
 
 #
 # I2C GPIO expanders:
@@ -1897,6 +1932,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_CS5535 is not set
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_RDC321X is not set
 
 #
@@ -1905,6 +1941,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
 
 #
 # AC97 GPIO expanders:
@@ -1974,19 +2011,20 @@ CONFIG_MFD_SUPPORT=y
 # CONFIG_MFD_MAX8925 is not set
 # CONFIG_MFD_MAX8998 is not set
 # CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
 # CONFIG_ABX500_CORE is not set
 # CONFIG_EZX_PCAP is not set
-# CONFIG_AB8500_CORE is not set
 # CONFIG_MFD_TIMBERDALE is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_VX855 is not set
 # CONFIG_REGULATOR is not set
 CONFIG_MEDIA_SUPPORT=m
 
@@ -2012,6 +2050,7 @@ CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
 CONFIG_IR_JVC_DECODER=m
 CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_IMON=m
 # CONFIG_IR_MCEUSB is not set
@@ -2019,6 +2058,10 @@ CONFIG_IR_IMON=m
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_CUSTOMISE=y
+
+#
+# Customize TV tuners
+#
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA8290=m
 CONFIG_MEDIA_TUNER_TDA827X=m
@@ -2037,6 +2080,7 @@ CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEOBUF_GEN=m
@@ -2049,27 +2093,52 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
 CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders
+#
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS53L32A=m
 CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
 CONFIG_VIDEO_VP27SMPX=m
+
+#
+# RDS decoders
+#
+
+#
+# Video decoders
+#
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_TVP5150=m
+
+#
+# Video and audio decoders
+#
 CONFIG_VIDEO_CX25840=m
+
+#
+# MPEG video encoders
+#
 CONFIG_VIDEO_CX2341X=m
+
+#
+# Video encoders
+#
 CONFIG_VIDEO_SAA7127=m
+
+#
+# Video improvement chips
+#
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
+# CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_BT848 is not set
-# CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
-# CONFIG_VIDEO_STRADIS is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_SAA7134 is not set
 # CONFIG_VIDEO_MXB is not set
@@ -2083,6 +2152,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_CX18 is not set
 # CONFIG_VIDEO_SAA7164 is not set
 # CONFIG_VIDEO_CAFE_CCIC is not set
+# CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
@@ -2097,6 +2167,7 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+# CONFIG_USB_GSPCA_KONICA is not set
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_OV519=m
@@ -2125,6 +2196,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
@@ -2207,12 +2279,49 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 # Supported DVB Frontends
 #
 # CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# Multistandard (satellite) frontends
+#
+
+#
+# DVB-S (satellite) frontends
+#
+
+#
+# DVB-T (terrestrial) frontends
+#
 CONFIG_DVB_ZL10353=m
 CONFIG_DVB_TDA10048=m
+
+#
+# DVB-C (cable) frontends
+#
 CONFIG_DVB_TDA10023=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
 CONFIG_DVB_LGDT330X=m
 CONFIG_DVB_S5H1409=m
 CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+
+#
+# Digital terrestrial only tuners/PLL
+#
+
+#
+# SEC control devices for DVB-S
+#
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
 # CONFIG_DAB is not set
 
 #
@@ -2221,6 +2330,7 @@ CONFIG_DVB_S5H1411=m
 CONFIG_VGA_ARB=y
 CONFIG_VGA_ARB_MAX_GPUS=16
 # CONFIG_DRM is not set
+# CONFIG_STUB_POULSBO is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
 CONFIG_FB=m
@@ -2331,6 +2441,7 @@ CONFIG_SND_RAWMIDI_SEQ=m
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_DRIVERS=y
 # CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
 # CONFIG_SND_VIRMIDI is not set
 # CONFIG_SND_MTPAV is not set
 # CONFIG_SND_SERIAL_U16550 is not set
@@ -2375,6 +2486,8 @@ CONFIG_HID_EGALAX=m
 # CONFIG_HID_ELECOM is not set
 CONFIG_HID_EZKEY=y
 CONFIG_HID_KYE=y
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
 CONFIG_HID_GYRATION=y
 CONFIG_HID_TWINHAN=y
 CONFIG_HID_KENSINGTON=y
@@ -2382,6 +2495,7 @@ CONFIG_HID_LOGITECH=y
 # CONFIG_LOGITECH_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGIG940_FF is not set
+# CONFIG_LOGIWII_FF is not set
 # CONFIG_HID_MAGICMOUSE is not set
 CONFIG_HID_MICROSOFT=y
 # CONFIG_HID_MOSART is not set
@@ -2399,6 +2513,7 @@ CONFIG_HID_PICOLCD_LEDS=y
 # CONFIG_HID_QUANTA is not set
 # CONFIG_HID_ROCCAT is not set
 # CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
 CONFIG_HID_SAMSUNG=y
 CONFIG_HID_SONY=y
 # CONFIG_HID_STANTUM is not set
@@ -2484,6 +2599,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_ONETOUCH=m
 # CONFIG_USB_STORAGE_KARMA is not set
 # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+CONFIG_USB_UAS=y
 # CONFIG_USB_LIBUSUAL is not set
 
 #
@@ -2546,6 +2662,7 @@ CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
+# CONFIG_USB_SERIAL_SAMBA is not set
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
@@ -2584,6 +2701,7 @@ CONFIG_USB_SISUSBVGA_CON=y
 # CONFIG_USB_IOWARRIOR is not set
 # CONFIG_USB_TEST is not set
 CONFIG_USB_ISIGHTFW=m
+# CONFIG_USB_YUREX is not set
 # CONFIG_USB_GADGET is not set
 
 #
@@ -2595,7 +2713,6 @@ CONFIG_USB_ISIGHTFW=m
 CONFIG_UWB=m
 # CONFIG_UWB_HWA is not set
 # CONFIG_UWB_WHCI is not set
-# CONFIG_UWB_WLP is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
@@ -2604,6 +2721,7 @@ CONFIG_MMC=y
 # MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
 CONFIG_SDIO_UART=y
 # CONFIG_MMC_TEST is not set
@@ -2619,6 +2737,7 @@ CONFIG_MMC_MVSDIO=y
 # CONFIG_MMC_SPI is not set
 # CONFIG_MMC_CB710 is not set
 # CONFIG_MMC_VIA_SDMMC is not set
+# CONFIG_MMC_USHC is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -2630,11 +2749,14 @@ CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_GPIO_PLATFORM=y
 # CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP5521 is not set
+# CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
 CONFIG_LEDS_NS2=y
+CONFIG_LEDS_NETXBIG=y
 CONFIG_LEDS_TRIGGERS=y
 
 #
@@ -2726,6 +2848,7 @@ CONFIG_DMADEVICES=y
 #
 # DMA Devices
 #
+CONFIG_ASYNC_TX_ENABLE_CHANNEL_SWITCH=y
 CONFIG_MV_XOR=y
 # CONFIG_TIMB_DMA is not set
 CONFIG_DMA_ENGINE=y
@@ -2745,6 +2868,8 @@ CONFIG_ET131X=m
 # CONFIG_VIDEO_GO7007 is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_VIDEO_TM6000 is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_STRADIS is not set
 CONFIG_USB_IP_COMMON=m
 CONFIG_USB_IP_VHCI_HCD=m
 CONFIG_USB_IP_HOST=m
@@ -2752,16 +2877,20 @@ CONFIG_USB_IP_DEBUG_ENABLE=y
 CONFIG_W35UND=m
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-CONFIG_OTUS=m
+CONFIG_BRCM80211=y
+CONFIG_BRCM80211_PCI=y
+# CONFIG_BRCMFMAC is not set
 CONFIG_RT2870=m
 # CONFIG_COMEDI is not set
 CONFIG_ASUS_OLED=m
 CONFIG_R8187SE=m
-CONFIG_RTL8192SU=m
 CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
+CONFIG_R8712U=y
+CONFIG_R8712_AP=y
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
+CONFIG_AUTOFS_FS=m
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
 CONFIG_USB_SERIAL_QUATECH2=m
@@ -2772,7 +2901,6 @@ CONFIG_FB_UDL=m
 # CONFIG_VME_BUS is not set
 # CONFIG_IIO is not set
 CONFIG_ZRAM=m
-CONFIG_ZRAM_STATS=y
 # CONFIG_BATMAN_ADV is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_VIDEO_DT3155 is not set
@@ -2781,13 +2909,39 @@ CONFIG_ZRAM_STATS=y
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
 # CONFIG_ST_BT is not set
 # CONFIG_ADIS16255 is not set
 CONFIG_FB_XGI=m
 # CONFIG_LIRC_STAGING is not set
+# CONFIG_SMB_FS is not set
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
+CONFIG_MACH_NO_WESTBRIDGE=y
+CONFIG_ATH6K_LEGACY=y
+CONFIG_AR600x_SD31_XXX=y
+# CONFIG_AR600x_WB31_XXX is not set
+# CONFIG_AR600x_SD32_XXX is not set
+# CONFIG_AR600x_CUSTOM_XXX is not set
+CONFIG_ATH6KL_ENABLE_COEXISTENCE=y
+CONFIG_AR600x_DUAL_ANTENNA=y
+# CONFIG_AR600x_SINGLE_ANTENNA is not set
+# CONFIG_AR600x_BT_QCOM is not set
+# CONFIG_AR600x_BT_CSR is not set
+CONFIG_AR600x_BT_AR3001=y
+# CONFIG_ATH6KL_HCI_BRIDGE is not set
+CONFIG_ATH6KL_CFG80211=y
+# CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER is not set
+# CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_USB_ENESTORAGE is not set
+# CONFIG_BCM_WIMAX is not set
+# CONFIG_FT1000 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
 
 #
 # File systems
@@ -2834,10 +2988,12 @@ CONFIG_XFS_POSIX_ACL=y
 CONFIG_BTRFS_FS=m
 # CONFIG_BTRFS_FS_POSIX_ACL is not set
 CONFIG_NILFS2_FS=m
+CONFIG_EXPORTFS=m
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
 CONFIG_QUOTA=y
 # CONFIG_QUOTA_NETLINK_INTERFACE is not set
 CONFIG_PRINT_QUOTA_WARNING=y
@@ -2845,7 +3001,6 @@ CONFIG_PRINT_QUOTA_WARNING=y
 # CONFIG_QFMT_V1 is not set
 # CONFIG_QFMT_V2 is not set
 CONFIG_QUOTACTL=y
-CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
@@ -2945,19 +3100,18 @@ CONFIG_ROOT_NFS=y
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
 CONFIG_NFSD=m
+CONFIG_NFSD_DEPRECATED=y
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V4=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 CONFIG_SUNRPC_GSS=y
 CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
@@ -2968,6 +3122,7 @@ CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_DFS_UPCALL is not set
 CONFIG_CIFS_FSCACHE=y
+# CONFIG_CIFS_ACL is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
 CONFIG_CODA_FS=m
@@ -3068,8 +3223,10 @@ CONFIG_DEBUG_PREEMPT=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
 # CONFIG_DEBUG_MUTEXES is not set
+CONFIG_BKL=y
 # CONFIG_DEBUG_LOCK_ALLOC is not set
 # CONFIG_PROVE_LOCKING is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
@@ -3081,6 +3238,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_WRITECOUNT is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_LIST is not set
+# CONFIG_TEST_LIST_SORT is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_DEBUG_NOTIFIERS is not set
 # CONFIG_DEBUG_CREDENTIALS is not set
@@ -3098,6 +3256,8 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_PAGE_POISONING is not set
 CONFIG_NOP_TRACER=y
 CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
@@ -3119,9 +3279,11 @@ CONFIG_KPROBE_EVENT=y
 # CONFIG_RING_BUFFER_BENCHMARK is not set
 # CONFIG_DYNAMIC_DEBUG is not set
 # CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
+# CONFIG_STRICT_DEVMEM is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_USER=y
 # CONFIG_DEBUG_ERRORS is not set
@@ -3134,6 +3296,7 @@ CONFIG_DEBUG_USER=y
 #
 CONFIG_KEYS=y
 # CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
@@ -3154,13 +3317,11 @@ CONFIG_ASYNC_MEMCPY=m
 CONFIG_ASYNC_XOR=m
 CONFIG_ASYNC_PQ=m
 CONFIG_ASYNC_RAID6_RECOV=m
-# CONFIG_ASYNC_RAID6_TEST is not set
 CONFIG_CRYPTO=y
 
 #
 # Crypto core or helper
 #
-CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=m
diff --git a/core/kernel26/LEDs.patch b/core/kernel26/LEDs.patch
index fc40e7b73..084e484ed 100644
--- a/core/kernel26/LEDs.patch
+++ b/core/kernel26/LEDs.patch
@@ -1,122 +1,3 @@
-diff -urN a//arch/arm/mach-kirkwood/dockstar-setup.c b//arch/arm/mach-kirkwood/dockstar-setup.c
---- a//arch/arm/mach-kirkwood/dockstar-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b//arch/arm/mach-kirkwood/dockstar-setup.c	2010-12-18 00:46:04.109176002 -0700
-@@ -0,0 +1,115 @@
-+/*
-+ * arch/arm/mach-kirkwood/dockstar-setup.c
-+ *
-+ * Seagate Dockstar
-+ *
-+ * This file is licensed under the terms of the GNU General Public
-+ * License version 2.  This program is licensed "as is" without any
-+ * warranty of any kind, whether express or implied.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/ata_platform.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mv643xx_eth.h>
-+#include <linux/gpio.h>
-+#include <linux/leds.h>
-+#include <asm/mach-types.h>
-+#include <asm/mach/arch.h>
-+#include <mach/kirkwood.h>
-+#include "common.h"
-+#include "mpp.h"
-+
-+static struct mtd_partition dockstar_nand_parts[] = {
-+        {
-+                .name = "u-boot",
-+                .offset = 0,
-+                .size = SZ_1M
-+        }, {
-+                .name = "uImage",
-+                .offset = MTDPART_OFS_NXTBLK,
-+                .size = SZ_4M
-+        }, {
-+                .name = "root",
-+                .offset = MTDPART_OFS_NXTBLK,
-+                .size = SZ_32M
-+        }, {
-+                .name = "ubi",
-+                .offset = MTDPART_OFS_NXTBLK,
-+                .size = MTDPART_SIZ_FULL
-+        },
-+};
-+
-+static struct mv643xx_eth_platform_data dockstar_ge00_data = {
-+        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-+};
-+
-+static struct gpio_led dockstar_led_pins[] = {
-+        {
-+                .name                   = "status:green:health",
-+                .default_trigger        = "none",
-+                .gpio                   = 46,
-+                .active_low             = 1,
-+        },
-+        {
-+                .name                   = "status:orange:misc",
-+                .default_trigger        = "default-on",
-+                .gpio                   = 47,
-+                .active_low             = 1,
-+        }
-+};
-+
-+static struct gpio_led_platform_data dockstar_led_data = {
-+        .leds           = dockstar_led_pins,
-+        .num_leds       = ARRAY_SIZE(dockstar_led_pins),
-+};
-+
-+static struct platform_device dockstar_leds = {
-+        .name   = "leds-gpio",
-+        .id     = -1,
-+        .dev    = {
-+                .platform_data  = &dockstar_led_data,
-+        }
-+};
-+
-+static unsigned int dockstar_mpp_config[] __initdata = {
-+        MPP29_GPIO,     /* USB Power Enable */
-+        MPP47_GPIO,     /* LED Orange */
-+        MPP46_GPIO,     /* LED Green */
-+        0
-+};
-+
-+static void __init dockstar_init(void)
-+{
-+        /*
-+         * Basic setup. Needs to be called early.
-+         */
-+        kirkwood_init();
-+
-+        /* setup gpio pin select */
-+        kirkwood_mpp_conf(dockstar_mpp_config);
-+
-+        kirkwood_uart0_init();
-+        kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25);
-+
-+        if (gpio_request(29, "USB Power Enable") != 0 ||
-+            gpio_direction_output(29, 1) != 0)
-+                printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n");
-+        kirkwood_ehci_init();
-+        kirkwood_ge00_init(&dockstar_ge00_data);
-+
-+        platform_device_register(&dockstar_leds);
-+}
-+
-+MACHINE_START(DOCKSTAR, "Seagate Dockstar")
-+        /* Maintainer: Peter Carmichael <peterjncarm@ovi.com> */
-+        .phys_io        = KIRKWOOD_REGS_PHYS_BASE,
-+        .io_pg_offst    = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
-+        .boot_params    = 0x00000100,
-+        .init_machine   = dockstar_init,
-+        .map_io         = kirkwood_map_io,
-+        .init_irq       = kirkwood_init_irq,
-+        .timer          = &kirkwood_timer,
-+MACHINE_END
 diff -urN a//arch/arm/mach-kirkwood/goflexnet-setup.c b//arch/arm/mach-kirkwood/goflexnet-setup.c
 --- a//arch/arm/mach-kirkwood/goflexnet-setup.c	1969-12-31 17:00:00.000000000 -0700
 +++ b//arch/arm/mach-kirkwood/goflexnet-setup.c	2010-12-18 00:50:13.369176001 -0700
@@ -273,7 +154,7 @@ diff -urN a//arch/arm/mach-kirkwood/guruplug-setup.c b//arch/arm/mach-kirkwood/g
 diff -urN a//arch/arm/mach-kirkwood/Kconfig b//arch/arm/mach-kirkwood/Kconfig
 --- a//arch/arm/mach-kirkwood/Kconfig	2010-12-09 15:17:27.000000000 -0700
 +++ b//arch/arm/mach-kirkwood/Kconfig	2010-12-18 00:50:13.369176001 -0700
-@@ -58,6 +58,12 @@
+@@ -64,6 +64,12 @@
  	  QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS
  	  devices.
  
@@ -286,137 +167,10 @@ diff -urN a//arch/arm/mach-kirkwood/Kconfig b//arch/arm/mach-kirkwood/Kconfig
  config MACH_OPENRD
          bool
  
-diff -urN a//arch/arm/mach-kirkwood/Kconfig.orig b//arch/arm/mach-kirkwood/Kconfig.orig
---- a//arch/arm/mach-kirkwood/Kconfig.orig	1969-12-31 17:00:00.000000000 -0700
-+++ b//arch/arm/mach-kirkwood/Kconfig.orig	2010-12-18 00:39:19.539176001 -0700
-@@ -0,0 +1,123 @@
-+if ARCH_KIRKWOOD
-+
-+menu "Marvell Kirkwood Implementations"
-+
-+config MACH_DB88F6281_BP
-+	bool "Marvell DB-88F6281-BP Development Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell DB-88F6281-BP Development Board.
-+
-+config MACH_RD88F6192_NAS
-+	bool "Marvell RD-88F6192-NAS Reference Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell RD-88F6192-NAS Reference Board.
-+
-+config MACH_RD88F6281
-+	bool "Marvell RD-88F6281 Reference Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell RD-88F6281 Reference Board.
-+
-+config MACH_MV88F6281GTW_GE
-+	bool "Marvell 88F6281 GTW GE Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell 88F6281 GTW GE Board.
-+
-+config MACH_SHEEVAPLUG
-+	bool "Marvell SheevaPlug Reference Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell SheevaPlug Reference Board.
-+
-+config MACH_ESATA_SHEEVAPLUG
-+	bool "Marvell eSATA SheevaPlug Reference Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell eSATA SheevaPlug Reference Board.
-+
-+config MACH_GURUPLUG
-+	bool "Marvell GuruPlug Reference Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell GuruPlug Reference Board.
-+
-+config MACH_TS219
-+	bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS
-+	  devices.
-+
-+config MACH_TS41X
-+	bool "QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS
-+	  devices.
-+
-+config MACH_OPENRD
-+        bool
-+
-+config MACH_OPENRD_BASE
-+	bool "Marvell OpenRD Base Board"
-+	select MACH_OPENRD
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell OpenRD Base Board.
-+
-+config MACH_OPENRD_CLIENT
-+	bool "Marvell OpenRD Client Board"
-+	select MACH_OPENRD
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell OpenRD Client Board.
-+
-+config MACH_OPENRD_ULTIMATE
-+	bool "Marvell OpenRD Ultimate Board"
-+	select MACH_OPENRD
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  Marvell OpenRD Ultimate Board.
-+
-+config MACH_NETSPACE_V2
-+	bool "LaCie Network Space v2 NAS Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  LaCie Network Space v2 NAS.
-+
-+config MACH_INETSPACE_V2
-+	bool "LaCie Internet Space v2 NAS Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  LaCie Internet Space v2 NAS.
-+
-+config MACH_NETSPACE_MAX_V2
-+	bool "LaCie Network Space Max v2 NAS Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  LaCie Network Space Max v2 NAS.
-+
-+config MACH_NET2BIG_V2
-+	bool "LaCie 2Big Network v2 NAS Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  LaCie 2Big Network v2 NAS.
-+
-+config MACH_NET5BIG_V2
-+	bool "LaCie 5Big Network v2 NAS Board"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  LaCie 5Big Network v2 NAS.
-+
-+config MACH_T5325
-+	bool "HP t5325 Thin Client"
-+	help
-+	  Say 'Y' here if you want your kernel to support the
-+	  HP t5325 Thin Client.
-+
-+endmenu
-+
-+endif
 diff -urN a//arch/arm/mach-kirkwood/Makefile b//arch/arm/mach-kirkwood/Makefile
 --- a//arch/arm/mach-kirkwood/Makefile	2010-12-09 15:17:27.000000000 -0700
 +++ b//arch/arm/mach-kirkwood/Makefile	2010-12-18 00:50:13.369176001 -0700
-@@ -8,6 +8,7 @@
+@@ -9,6 +9,7 @@
  obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
  obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
  obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o tsx1x-common.o
@@ -424,30 +178,7 @@ diff -urN a//arch/arm/mach-kirkwood/Makefile b//arch/arm/mach-kirkwood/Makefile
  obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
  obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
  obj-$(CONFIG_MACH_NETSPACE_V2)		+= netspace_v2-setup.o
-diff -urN a//arch/arm/mach-kirkwood/Makefile.orig b//arch/arm/mach-kirkwood/Makefile.orig
---- a//arch/arm/mach-kirkwood/Makefile.orig	1969-12-31 17:00:00.000000000 -0700
-+++ b//arch/arm/mach-kirkwood/Makefile.orig	2010-12-18 00:39:19.589176000 -0700
-@@ -0,0 +1,20 @@
-+obj-y				+= common.o addr-map.o irq.o pcie.o mpp.o
-+
-+obj-$(CONFIG_MACH_DB88F6281_BP)		+= db88f6281-bp-setup.o
-+obj-$(CONFIG_MACH_RD88F6192_NAS)	+= rd88f6192-nas-setup.o
-+obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o
-+obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o
-+obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o
-+obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
-+obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
-+obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o tsx1x-common.o
-+obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
-+obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
-+obj-$(CONFIG_MACH_NETSPACE_V2)		+= netspace_v2-setup.o
-+obj-$(CONFIG_MACH_INETSPACE_V2)		+= netspace_v2-setup.o
-+obj-$(CONFIG_MACH_NETSPACE_MAX_V2)	+= netspace_v2-setup.o
-+obj-$(CONFIG_MACH_NET2BIG_V2)		+= netxbig_v2-setup.o
-+obj-$(CONFIG_MACH_NET5BIG_V2)		+= netxbig_v2-setup.o
-+obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o
-+
-+obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
+
 diff -urN a//arch/arm/mach-kirkwood/sheevaplug-setup.c b//arch/arm/mach-kirkwood/sheevaplug-setup.c
 --- a//arch/arm/mach-kirkwood/sheevaplug-setup.c	2010-12-09 15:17:27.000000000 -0700
 +++ b//arch/arm/mach-kirkwood/sheevaplug-setup.c	2010-12-18 00:50:13.409176002 -0700
@@ -460,418 +191,3 @@ diff -urN a//arch/arm/mach-kirkwood/sheevaplug-setup.c b//arch/arm/mach-kirkwood
  		.default_trigger	= "default-on",
  		.gpio			= 49,
  		.active_low		= 1,
-diff -urN a//arch/arm/tools/mach-types b//arch/arm/tools/mach-types
---- a//arch/arm/tools/mach-types	2010-12-09 15:17:27.000000000 -0700
-+++ b//arch/arm/tools/mach-types	2010-12-18 00:50:13.409176002 -0700
-@@ -12,7 +12,7 @@
- #
- #   http://www.arm.linux.org.uk/developer/machines/?action=new
- #
--# Last update: Thu Sep 9 22:43:01 2010
-+# Last update: Tue Dec 14 00:41:45 2010
- #
- # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
- #
-@@ -1319,7 +1319,7 @@
- msm			MACH_MSM		MSM			1316
- ct5910			MACH_CT5910		CT5910			1317
- ct5912			MACH_CT5912		CT5912			1318
--hynet_ine		MACH_HYNET_INE		HYNET_INE		1319
-+argonst_mp		MACH_HYNET_INE		HYNET_INE		1319
- hynet_app		MACH_HYNET_APP		HYNET_APP		1320
- msm7200			MACH_MSM7200		MSM7200			1321
- msm7600			MACH_MSM7600		MSM7600			1322
-@@ -1777,7 +1777,7 @@
- sg560adsl		MACH_SG560ADSL		SG560ADSL		1786
- nextio_n2800_ica	MACH_NEXTIO_N2800_ICA	NEXTIO_N2800_ICA	1787
- dove_db			MACH_DOVE_DB		DOVE_DB			1788
--marvell_newdb		MACH_MARVELL_NEWDB	MARVELL_NEWDB		1789
-+dove_avng		MACH_MARVELL_NEWDB	MARVELL_NEWDB		1789
- vandihud		MACH_VANDIHUD		VANDIHUD		1790
- magx_e8			MACH_MAGX_E8		MAGX_E8			1791
- magx_z6			MACH_MAGX_Z6		MAGX_Z6			1792
-@@ -1877,7 +1877,7 @@
- esiblade		MACH_ESIBLADE		ESIBLADE		1886
- eye02			MACH_EYE02		EYE02			1887
- imx27kbd		MACH_IMX27KBD		IMX27KBD		1888
--sst61vc010_fpga		MACH_SST61VC010_FPGA	SST61VC010_FPGA		1889
-+p87_fpga		MACH_SST61VC010_FPGA	SST61VC010_FPGA		1889
- kixvp435		MACH_KIXVP435		KIXVP435		1890
- kixnp435		MACH_KIXNP435		KIXNP435		1891
- africa			MACH_AFRICA		AFRICA			1892
-@@ -2308,7 +2308,7 @@
- tazkiosk		MACH_TAZKIOSK		TAZKIOSK		2320
- whiterabbit_mch		MACH_WHITERABBIT_MCH	WHITERABBIT_MCH		2321
- sbox9263		MACH_SBOX9263		SBOX9263		2322
--oreo			MACH_OREO		OREO			2323
-+oreo_camera		MACH_OREO		OREO			2323
- smdk6442		MACH_SMDK6442		SMDK6442		2324
- openrd_base		MACH_OPENRD_BASE	OPENRD_BASE		2325
- incredible		MACH_INCREDIBLE		INCREDIBLE		2326
-@@ -2321,7 +2321,7 @@
- u380			MACH_U380		U380			2333
- oamp3_hualu		MACH_HUALU_BOARD	HUALU_BOARD		2334
- npcmx50			MACH_NPCMX50		NPCMX50			2335
--mx51_lange51		MACH_MX51_LANGE51	MX51_LANGE51		2336
-+mx51_efikamx		MACH_MX51_EFIKAMX	MX51_EFIKAMX		2336
- mx51_lange52		MACH_MX51_LANGE52	MX51_LANGE52		2337
- riom			MACH_RIOM		RIOM			2338
- comcas			MACH_COMCAS		COMCAS			2339
-@@ -2355,7 +2355,7 @@
- csb732			MACH_CSB732		CSB732			2367
- u8500			MACH_U8500		U8500			2368
- huqiu			MACH_HUQIU		HUQIU			2369
--mx51_kunlun		MACH_MX51_KUNLUN	MX51_KUNLUN		2370
-+mx51_efikasb		MACH_MX51_EFIKASB	MX51_EFIKASB		2370
- pmt1g			MACH_PMT1G		PMT1G			2371
- htcelf			MACH_HTCELF		HTCELF			2372
- armadillo420		MACH_ARMADILLO420	ARMADILLO420		2373
-@@ -2374,7 +2374,7 @@
- rbl01			MACH_RBL01		RBL01			2387
- omnifi			MACH_OMNIFI		OMNIFI			2388
- otavalo			MACH_OTAVALO		OTAVALO			2389
--sienna			MACH_SIENNA		SIENNA			2390
-+siena			MACH_SIENNA		SIENNA			2390
- htc_excalibur_s620	MACH_HTC_EXCALIBUR_S620	HTC_EXCALIBUR_S620	2391
- htc_opal		MACH_HTC_OPAL		HTC_OPAL		2392
- touchbook		MACH_TOUCHBOOK		TOUCHBOOK		2393
-@@ -2446,7 +2446,7 @@
- siogentoo2		MACH_SIOGENTOO2		SIOGENTOO2		2459
- sm3k			MACH_SM3K		SM3K			2460
- acer_tempo_f900		MACH_ACER_TEMPO_F900	ACER_TEMPO_F900		2461
--sst61vc010_dev		MACH_SST61VC010_DEV	SST61VC010_DEV		2462
-+p87_dev			MACH_SST61VC010_DEV	SST61VC010_DEV		2462
- glittertind		MACH_GLITTERTIND	GLITTERTIND		2463
- omap_zoom3		MACH_OMAP_ZOOM3		OMAP_ZOOM3		2464
- omap_3630sdp		MACH_OMAP_3630SDP	OMAP_3630SDP		2465
-@@ -2498,7 +2498,7 @@
- phy3250			MACH_PHY3250		PHY3250			2511
- ea3250			MACH_EA3250		EA3250			2512
- fdi3250			MACH_FDI3250		FDI3250			2513
--whitestone		MACH_WHITESTONE		WHITESTONE		2514
-+htcwhitestone		MACH_WHITESTONE		WHITESTONE		2514
- at91sam9263nit		MACH_AT91SAM9263NIT	AT91SAM9263NIT		2515
- ccmx51			MACH_CCMX51		CCMX51			2516
- ccmx51js		MACH_CCMX51JS		CCMX51JS		2517
-@@ -2561,7 +2561,7 @@
- emxx			MACH_EMXX		EMXX			2574
- outlaw			MACH_OUTLAW		OUTLAW			2575
- riot_bei2		MACH_RIOT_BEI2		RIOT_BEI2		2576
--riot_vox		MACH_RIOT_VOX		RIOT_VOX		2577
-+riot_gx2		MACH_RIOT_VOX		RIOT_VOX		2577
- riot_x37		MACH_RIOT_X37		RIOT_X37		2578
- mega25mx		MACH_MEGA25MX		MEGA25MX		2579
- benzina2		MACH_BENZINA2		BENZINA2		2580
-@@ -2582,7 +2582,7 @@
- pca101			MACH_PCA101		PCA101			2595
- buzzc			MACH_BUZZC		BUZZC			2596
- sasie2			MACH_SASIE2		SASIE2			2597
--davinci_cio		MACH_DAVINCI_CIO	DAVINCI_CIO		2598
-+davinci_dm6467_cio	MACH_DAVINCI_CIO	DAVINCI_CIO		2598
- smartmeter_dl		MACH_SMARTMETER_DL	SMARTMETER_DL		2599
- wzl6410			MACH_WZL6410		WZL6410			2600
- wzl6410m		MACH_WZL6410M		WZL6410M		2601
-@@ -2591,7 +2591,7 @@
- spacecom1		MACH_SPACECOM1		SPACECOM1		2604
- pingu920		MACH_PINGU920		PINGU920		2605
- bravoc			MACH_BRAVOC		BRAVOC			2606
--cybo2440		MACH_CYBO2440		CYBO2440		2607
-+mydev			MACH_CYBO2440		CYBO2440		2607
- vdssw			MACH_VDSSW		VDSSW			2608
- romulus			MACH_ROMULUS		ROMULUS			2609
- omap_magic		MACH_OMAP_MAGIC		OMAP_MAGIC		2610
-@@ -2683,7 +2683,7 @@
- mw6410			MACH_MW6410		MW6410			2696
- terastation_wxl		MACH_TERASTATION_WXL	TERASTATION_WXL		2697
- cpu8000e		MACH_CPU8000E		CPU8000E		2698
--catania			MACH_CATANIA		CATANIA			2699
-+catania_s		MACH_CATANIA		CATANIA			2699
- tokyo			MACH_TOKYO		TOKYO			2700
- msm7201a_surf		MACH_MSM7201A_SURF	MSM7201A_SURF		2701
- msm7201a_ffa		MACH_MSM7201A_FFA	MSM7201A_FFA		2702
-@@ -2750,7 +2750,7 @@
- smint01			MACH_SMINT01		SMINT01			2763
- prtlvt2			MACH_PRTLVT2		PRTLVT2			2764
- ap420			MACH_AP420		AP420			2765
--htcshift		MACH_HTCSHIFT		HTCSHIFT		2766
-+htcclio			MACH_HTCSHIFT		HTCSHIFT		2766
- davinci_dm365_fc	MACH_DAVINCI_DM365_FC	DAVINCI_DM365_FC	2767
- msm8x55_surf		MACH_MSM8X55_SURF	MSM8X55_SURF		2768
- msm8x55_ffa		MACH_MSM8X55_FFA	MSM8X55_FFA		2769
-@@ -2761,7 +2761,7 @@
- kopin_models		MACH_KOPIN_MODELS	KOPIN_MODELS		2774
- ttc_vision2		MACH_TTC_VISION2	TTC_VISION2		2775
- cns3420vb		MACH_CNS3420VB		CNS3420VB		2776
--lpc2			MACH_LPC2		LPC2			2777
-+lpc_evo			MACH_LPC2		LPC2			2777
- olympus			MACH_OLYMPUS		OLYMPUS			2778
- vortex			MACH_VORTEX		VORTEX			2779
- s5pc200			MACH_S5PC200		S5PC200			2780
-@@ -2788,7 +2788,7 @@
- neocoreomap		MACH_NEOCOREOMAP	NEOCOREOMAP		2801
- withings_wbp		MACH_WITHINGS_WBP	WITHINGS_WBP		2802
- dbps			MACH_DBPS		DBPS			2803
--sbc9261			MACH_SBC9261		SBC9261			2804
-+at91sam9261		MACH_SBC9261		SBC9261			2804
- pcbfp0001		MACH_PCBFP0001		PCBFP0001		2805
- speedy			MACH_SPEEDY		SPEEDY			2806
- chrysaor		MACH_CHRYSAOR		CHRYSAOR		2807
-@@ -2812,7 +2812,7 @@
- acer_a4			MACH_ACER_A4		ACER_A4			2825
- davinci_dm368_bip	MACH_DAVINCI_DM368_BIP	DAVINCI_DM368_BIP	2826
- eshare			MACH_ESHARE		ESHARE			2827
--hw_omapl138_europa	MACH_HW_OMAPL138_EUROPA	HW_OMAPL138_EUROPA	2828
-+omapl138_europa		MACH_HW_OMAPL138_EUROPA	HW_OMAPL138_EUROPA	2828
- wlbargn			MACH_WLBARGN		WLBARGN			2829
- bm170			MACH_BM170		BM170			2830
- netspace_mini_v2	MACH_NETSPACE_MINI_V2	NETSPACE_MINI_V2	2831
-@@ -2879,7 +2879,7 @@
- mecha			MACH_MECHA		MECHA			2892
- bubba3			MACH_BUBBA3		BUBBA3			2893
- pupitre			MACH_PUPITRE		PUPITRE			2894
--tegra_harmony		MACH_TEGRA_HARMONY	TEGRA_HARMONY		2895
-+tegra_unused		MACH_TEGRA_HARMONY	TEGRA_HARMONY		2895
- tegra_vogue		MACH_TEGRA_VOGUE	TEGRA_VOGUE		2896
- tegra_e1165		MACH_TEGRA_E1165	TEGRA_E1165		2897
- simplenet		MACH_SIMPLENET		SIMPLENET		2898
-@@ -2896,6 +2896,7 @@
- app3k_robin		MACH_APP3K_ROBIN	APP3K_ROBIN		2909
- pov15hd			MACH_POV15HD		POV15HD			2910
- stella			MACH_STELLA		STELLA			2911
-+htc_iolite		MACH_MACH_HTC_IOLITE	MACH_HTC_IOLITE		2912
- linkstation_lschl	MACH_LINKSTATION_LSCHL	LINKSTATION_LSCHL	2913
- netwalker		MACH_NETWALKER		NETWALKER		2914
- acsx106			MACH_ACSX106		ACSX106			2915
-@@ -2959,6 +2960,7 @@
- pc9260_v2		MACH_PC9260_V2		PC9260_V2		2973
- ptx7545			MACH_PTX7545		PTX7545			2974
- tm_efdc			MACH_TM_EFDC		TM_EFDC			2975
-+remove_me		MACH_WALDO1		WALDO1			2976
- omap3_waldo1		MACH_OMAP3_WALDO1	OMAP3_WALDO1		2977
- flyer			MACH_FLYER		FLYER			2978
- tornado3240		MACH_TORNADO3240	TORNADO3240		2979
-@@ -2969,9 +2971,9 @@
- ssc			MACH_SSC		SSC			2984
- premierwave_en		MACH_PREMIERWAVE_EN	PREMIERWAVE_EN		2985
- wasabi			MACH_WASABI		WASABI			2986
--vivow			MACH_VIVOW		VIVOW			2987
-+vivo_w			MACH_VIVOW		VIVOW			2987
- mx50_rdp		MACH_MX50_RDP		MX50_RDP		2988
--universal		MACH_UNIVERSAL		UNIVERSAL		2989
-+universal_c210		MACH_UNIVERSAL_C210	UNIVERSAL_C210		2989
- real6410		MACH_REAL6410		REAL6410		2990
- spx_sakura		MACH_SPX_SAKURA		SPX_SAKURA		2991
- ij3k_2440		MACH_IJ3K_2440		IJ3K_2440		2992
-@@ -2987,7 +2989,7 @@
- ea20			MACH_EA20		EA20			3002
- awm2			MACH_AWM2		AWM2			3003
- ti8148evm		MACH_TI8148EVM		TI8148EVM		3004
--tegra_seaboard		MACH_TEGRA_SEABOARD	TEGRA_SEABOARD		3005
-+seaboard		MACH_SEABOARD		SEABOARD		3005
- linkstation_chlv2	MACH_LINKSTATION_CHLV2	LINKSTATION_CHLV2	3006
- tera_pro2_rack		MACH_TERA_PRO2_RACK	TERA_PRO2_RACK		3007
- rubys			MACH_RUBYS		RUBYS			3008
-@@ -3017,12 +3019,12 @@
- at91cap7xdk		MACH_AT91CAP7XDK	AT91CAP7XDK		3032
- at91cap7stk		MACH_AT91CAP7STK	AT91CAP7STK		3033
- kt_sbc_sam9_1		MACH_KT_SBC_SAM9_1	KT_SBC_SAM9_1		3034
--oratisrouter		MACH_ORATISROUTER	ORATISROUTER		3035
-+at91sam9263router	MACH_ORATISROUTER	ORATISROUTER		3035
- armada_xp_db		MACH_ARMADA_XP_DB	ARMADA_XP_DB		3036
- spdm			MACH_SPDM		SPDM			3037
- gtib			MACH_GTIB		GTIB			3038
- dgm3240			MACH_DGM3240		DGM3240			3039
--atlas_i_lpe		MACH_ATLAS_I_LPE	ATLAS_I_LPE		3040
-+iv_atlas_i_lpe		MACH_ATLAS_I_LPE	ATLAS_I_LPE		3040
- htcmega			MACH_HTCMEGA		HTCMEGA			3041
- tricorder		MACH_TRICORDER		TRICORDER		3042
- tx28			MACH_TX28		TX28			3043
-@@ -3038,9 +3040,188 @@
- controltek9g20		MACH_CONTROLTEK9G20	CONTROLTEK9G20		3053
- tin307			MACH_TIN307		TIN307			3054
- tin510			MACH_TIN510		TIN510			3055
-+ep3505			MACH_EP3517		EP3517			3056
- bluecheese		MACH_BLUECHEESE		BLUECHEESE		3057
- tem3x30			MACH_TEM3X30		TEM3X30			3058
- harvest_desoto		MACH_HARVEST_DESOTO	HARVEST_DESOTO		3059
- msm8x60_qrdc		MACH_MSM8X60_QRDC	MSM8X60_QRDC		3060
- spear900		MACH_SPEAR900		SPEAR900		3061
- pcontrol_g20		MACH_PCONTROL_G20	PCONTROL_G20		3062
-+rdstor			MACH_RDSTOR		RDSTOR			3063
-+usdloader		MACH_USDLOADER		USDLOADER		3064
-+tsoploader		MACH_TSOPLOADER		TSOPLOADER		3065
-+kronos			MACH_KRONOS		KRONOS			3066
-+ffcore			MACH_FFCORE		FFCORE			3067
-+mone			MACH_MONE		MONE			3068
-+unit2s			MACH_UNIT2S		UNIT2S			3069
-+acer_a5			MACH_ACER_A5		ACER_A5			3070
-+etherpro_isp		MACH_ETHERPRO_ISP	ETHERPRO_ISP		3071
-+stretchs7000		MACH_STRETCHS7000	STRETCHS7000		3072
-+p87_smartsim		MACH_P87_SMARTSIM	P87_SMARTSIM		3073
-+tulip			MACH_TULIP		TULIP			3074
-+sunflower		MACH_SUNFLOWER		SUNFLOWER		3075
-+rib			MACH_RIB		RIB			3076
-+clod			MACH_CLOD		CLOD			3077
-+rump			MACH_RUMP		RUMP			3078
-+tenderloin		MACH_TENDERLOIN		TENDERLOIN		3079
-+shortloin		MACH_SHORTLOIN		SHORTLOIN		3080
-+roml1			MACH_CRESPO		CRESPO			3081
-+antares			MACH_ANTARES		ANTARES			3082
-+wb40n			MACH_WB40N		WB40N			3083
-+herring			MACH_HERRING		HERRING			3084
-+naxy400			MACH_NAXY400		NAXY400			3085
-+naxy1200		MACH_NAXY1200		NAXY1200		3086
-+vpr200			MACH_VPR200		VPR200			3087
-+bug20			MACH_BUG20		BUG20			3088
-+goflexnet		MACH_GOFLEXNET		GOFLEXNET		3089
-+torbreck		MACH_TORBRECK		TORBRECK		3090
-+saarb_mg1		MACH_SAARB_MG1		SAARB_MG1		3091
-+callisto		MACH_CALLISTO		CALLISTO		3092
-+multhsu			MACH_MULTHSU		MULTHSU			3093
-+saluda			MACH_SALUDA		SALUDA			3094
-+pemp_omap3_apollo	MACH_PEMP_OMAP3_APOLLO	PEMP_OMAP3_APOLLO	3095
-+vc0718			MACH_VC0718		VC0718			3096
-+mvblx			MACH_MVBLX		MVBLX			3097
-+inhand_apeiron		MACH_INHAND_APEIRON	INHAND_APEIRON		3098
-+inhand_fury		MACH_INHAND_FURY	INHAND_FURY		3099
-+inhand_siren		MACH_INHAND_SIREN	INHAND_SIREN		3100
-+hdnvp			MACH_HDNVP		HDNVP			3101
-+softwinner		MACH_SOFTWINNER		SOFTWINNER		3102
-+prima2_evb		MACH_PRIMA2_EVB		PRIMA2_EVB		3103
-+nas6210			MACH_NAS6210		NAS6210			3104
-+unisdev			MACH_UNISDEV		UNISDEV			3105
-+sbca11			MACH_SBCA11		SBCA11			3106
-+saga			MACH_SAGA		SAGA			3107
-+ns_k330			MACH_NS_K330		NS_K330			3108
-+tanna			MACH_TANNA		TANNA			3109
-+imate8502		MACH_IMATE8502		IMATE8502		3110
-+aspen			MACH_ASPEN		ASPEN			3111
-+daintree_cwac		MACH_DAINTREE_CWAC	DAINTREE_CWAC		3112
-+zmx25			MACH_ZMX25		ZMX25			3113
-+maple1			MACH_MAPLE1		MAPLE1			3114
-+qsd8x72_surf		MACH_QSD8X72_SURF	QSD8X72_SURF		3115
-+qsd8x72_ffa		MACH_QSD8X72_FFA	QSD8X72_FFA		3116
-+abilene			MACH_ABILENE		ABILENE			3117
-+eigen_ttr		MACH_EIGEN_TTR		EIGEN_TTR		3118
-+iomega_ix2_200		MACH_IOMEGA_IX2_200	IOMEGA_IX2_200		3119
-+coretec_vcx7400		MACH_CORETEC_VCX7400	CORETEC_VCX7400		3120
-+santiago		MACH_SANTIAGO		SANTIAGO		3121
-+mx257sol		MACH_MX257SOL		MX257SOL		3122
-+strasbourg		MACH_STRASBOURG		STRASBOURG		3123
-+msm8x60_fluid		MACH_MSM8X60_FLUID	MSM8X60_FLUID		3124
-+smartqv5		MACH_SMARTQV5		SMARTQV5		3125
-+smartqv3		MACH_SMARTQV3		SMARTQV3		3126
-+smartqv7		MACH_SMARTQV7		SMARTQV7		3127
-+tegra_paz00		MACH_PAZ00		PAZ00			3128
-+acmenetusfoxg20		MACH_ACMENETUSFOXG20	ACMENETUSFOXG20		3129
-+htc_willow		MACH_HTCWILLOW		HTCWILLOW		3130
-+fwbd_0404		MACH_FWBD_0404		FWBD_0404		3131
-+hdgu			MACH_HDGU		HDGU			3132
-+pyramid			MACH_PYRAMID		PYRAMID			3133
-+epiphan			MACH_EPIPHAN		EPIPHAN			3134
-+omap_bender		MACH_OMAP_BENDER	OMAP_BENDER		3135
-+gurnard			MACH_GURNARD		GURNARD			3136
-+gtl_it5100		MACH_GTL_IT5100		GTL_IT5100		3137
-+bcm2708			MACH_BCM2708		BCM2708			3138
-+mx51_ggc		MACH_MX51_GGC		MX51_GGC		3139
-+sharespace		MACH_SHARESPACE		SHARESPACE		3140
-+haba_knx_explorer	MACH_HABA_KNX_EXPLORER	HABA_KNX_EXPLORER	3141
-+simtec_kirkmod		MACH_SIMTEC_KIRKMOD	SIMTEC_KIRKMOD		3142
-+crux			MACH_CRUX		CRUX			3143
-+mx51_bravo		MACH_MX51_BRAVO		MX51_BRAVO		3144
-+charon			MACH_CHARON		CHARON			3145
-+picocom3		MACH_PICOCOM3		PICOCOM3		3146
-+picocom4		MACH_PICOCOM4		PICOCOM4		3147
-+serrano			MACH_SERRANO		SERRANO			3148
-+doubleshot		MACH_DOUBLESHOT		DOUBLESHOT		3149
-+evsy			MACH_EVSY		EVSY			3150
-+huashan			MACH_HUASHAN		HUASHAN			3151
-+lausanne		MACH_LAUSANNE		LAUSANNE		3152
-+emerald			MACH_EMERALD		EMERALD			3153
-+tqma35			MACH_TQMA35		TQMA35			3154
-+marvel			MACH_MARVEL		MARVEL			3155
-+manuae			MACH_MANUAE		MANUAE			3156
-+chacha			MACH_CHACHA		CHACHA			3157
-+lemon			MACH_LEMON		LEMON			3158
-+csc			MACH_CSC		CSC			3159
-+gira_knxip_router	MACH_GIRA_KNXIP_ROUTER	GIRA_KNXIP_ROUTER	3160
-+t20			MACH_T20		T20			3161
-+hdmini			MACH_HDMINI		HDMINI			3162
-+sciphone_g2		MACH_SCIPHONE_G2	SCIPHONE_G2		3163
-+express			MACH_EXPRESS		EXPRESS			3164
-+express_kt		MACH_EXPRESS_KT		EXPRESS_KT		3165
-+maximasp		MACH_MAXIMASP		MAXIMASP		3166
-+nitrogen_imx51		MACH_NITROGEN_IMX51	NITROGEN_IMX51		3167
-+nitrogen_imx53		MACH_NITROGEN_IMX53	NITROGEN_IMX53		3168
-+sunfire			MACH_SUNFIRE		SUNFIRE			3169
-+arowana			MACH_AROWANA		AROWANA			3170
-+tegra_daytona		MACH_TEGRA_DAYTONA	TEGRA_DAYTONA		3171
-+tegra_swordfish		MACH_TEGRA_SWORDFISH	TEGRA_SWORDFISH		3172
-+edison			MACH_EDISON		EDISON			3173
-+svp8500v1		MACH_SVP8500V1		SVP8500V1		3174
-+svp8500v2		MACH_SVP8500V2		SVP8500V2		3175
-+svp5500			MACH_SVP5500		SVP5500			3176
-+b5500			MACH_B5500		B5500			3177
-+s5500			MACH_S5500		S5500			3178
-+icon			MACH_ICON		ICON			3179
-+elephant		MACH_ELEPHANT		ELEPHANT		3180
-+msm8x60_charm_surf	MACH_MSM8X60_FUSION	MSM8X60_FUSION		3181
-+shooter			MACH_SHOOTER		SHOOTER			3182
-+spade_lte		MACH_SPADE_LTE		SPADE_LTE		3183
-+philhwani		MACH_PHILHWANI		PHILHWANI		3184
-+gsncomm			MACH_GSNCOMM		GSNCOMM			3185
-+strasbourg_a2		MACH_STRASBOURG_A2	STRASBOURG_A2		3186
-+mmm			MACH_MMM		MMM			3187
-+davinci_dm365_bv	MACH_DAVINCI_DM365_BV	DAVINCI_DM365_BV	3188
-+ag5evm			MACH_AG5EVM		AG5EVM			3189
-+sc575plc		MACH_SC575PLC		SC575PLC		3190
-+sc575hmi		MACH_SC575IPC		SC575IPC		3191
-+omap3_tdm3730		MACH_OMAP3_TDM3730	OMAP3_TDM3730		3192
-+rover_g7		MACH_G7			G7			3193
-+top9000_eval		MACH_TOP9000_EVAL	TOP9000_EVAL		3194
-+top9000_su		MACH_TOP9000_SU		TOP9000_SU		3195
-+utm300			MACH_UTM300		UTM300			3196
-+tsunagi			MACH_TSUNAGI		TSUNAGI			3197
-+ts75xx			MACH_TS75XX		TS75XX			3198
-+msm8x60_charm_ffa	MACH_MSM8X60_FUSN_FFA	MSM8X60_FUSN_FFA	3199
-+ts47xx			MACH_TS47XX		TS47XX			3200
-+da850_k5		MACH_DA850_K5		DA850_K5		3201
-+ax502			MACH_AX502		AX502			3202
-+igep0032		MACH_IGEP0032		IGEP0032		3203
-+antero			MACH_ANTERO		ANTERO			3204
-+synergy			MACH_SYNERGY		SYNERGY			3205
-+ics_if_voip		MACH_ICS_IF_VOIP	ICS_IF_VOIP		3206
-+wlf_cragg_6410		MACH_WLF_CRAGG_6410	WLF_CRAGG_6410		3207
-+punica			MACH_PUNICA		PUNICA			3208
-+sbc_nt250		MACH_SBC_NT250		SBC_NT250		3209
-+mx27_wmultra		MACH_MX27_WMULTRA	MX27_WMULTRA		3210
-+mackerel		MACH_MACKEREL		MACKEREL		3211
-+pvd_imx27		MACH_MACH_PVD_IMX27	MACH_PVD_IMX27		3212
-+fa9x27			MACH_FA9X27		FA9X27			3213
-+ns2816tb		MACH_NS2816TB		NS2816TB		3214
-+ns2816_ntpad		MACH_NS2816_NTPAD	NS2816_NTPAD		3215
-+ns2816_ntnb		MACH_NS2816_NTNB	NS2816_NTNB		3216
-+kaen			MACH_KAEN		KAEN			3217
-+nv1000			MACH_NV1000		NV1000			3218
-+nuc950ts		MACH_NUC950TS		NUC950TS		3219
-+nokia_rm680		MACH_NOKIA_RM680	NOKIA_RM680		3220
-+ast2200			MACH_AST2200		AST2200			3221
-+lead			MACH_LEAD		LEAD			3222
-+unino1			MACH_UNINO1		UNINO1			3223
-+greeco			MACH_GREECO		GREECO			3224
-+verdi			MACH_VERDI		VERDI			3225
-+dm6446_adbox		MACH_DM6446_ADBOX	DM6446_ADBOX		3226
-+quad_salsa		MACH_QUAD_SALSA		QUAD_SALSA		3227
-+abb_gma_1_1		MACH_ABB_GMA_1_1	ABB_GMA_1_1		3228
-+svcid			MACH_SVCID		SVCID			3229
-+msm8960_sim		MACH_MSM8960_SIM	MSM8960_SIM		3230
-+msm8960_rumi3		MACH_MSM8960_RUMI3	MSM8960_RUMI3		3231
-+icon_g			MACH_ICON_G		ICON_G			3232
-+mb3			MACH_MB3		MB3			3233
-+gsia18s			MACH_GSIA18S		GSIA18S			3234
-+pivicc			MACH_PIVICC		PIVICC			3235
-+pcm048			MACH_PCM048		PCM048			3236
-+dds			MACH_DDS		DDS			3237
-+chalten_xa1		MACH_CHALTEN_XA1	CHALTEN_XA1		3238
-+ts48xx			MACH_TS48XX		TS48XX			3239
-+tonga2_tfttimer		MACH_TONGA2_TFTTIMER	TONGA2_TFTTIMER		3240
diff --git a/core/kernel26/PKGBUILD b/core/kernel26/PKGBUILD
index d0eb130ac..dbe175663 100644
--- a/core/kernel26/PKGBUILD
+++ b/core/kernel26/PKGBUILD
@@ -4,13 +4,14 @@
 noautobuild=1
 
 # In kernel26-headers, scsi.h is explicitly copied to the package
+# this is done at the very end of this PKGBUILD
 
 pkgbase="kernel26"
 pkgname=('kernel26' 'kernel26-headers')
 _kernelname=${pkgname#kernel26}
-_basekernel=2.6.36
-pkgver=${_basekernel}.2
-pkgrel=2
+_basekernel=2.6.37
+pkgver=${_basekernel}
+pkgrel=4
 plugrel=1
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'make')
 _patchname="patch-${pkgver}-${pkgrel}-ARCH"
@@ -23,13 +24,13 @@ license=('GPL2')
 url="http://www.kernel.org"
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
-        2.6.36.2.config
+        2.6.37.config
         LEDs.patch
         kernel26.preset)
-md5sums=('61f3739a73afb6914cb007f37fb09b62'
-         '998b597b8659f1ac2667bbc13d1905b8'
+md5sums=('c8ee37b4fdccdb651e0603d35350b434'
+         '732176aeb134678b4e369e1d5d5fca2e'
          'd883153d9ec0abbd6796cac3eacdfbab'
-         'd9577edccb065042a7851a44ea4866c0'
+         '927bb9b3d5e48efa39740fdb1987799f'
          '25584700a0a679542929c4bed31433b6')
 
 build() {
@@ -41,8 +42,7 @@ build() {
  
   # Apply the LED patches
   patch -Np1 -i ${srcdir}/LEDs.patch
-
-  cat ../2.6.36.2.config >./.config
+  cat ../2.6.37.config >./.config
 
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
@@ -57,7 +57,6 @@ build() {
   #make oldconfig # using old config from previous kernel version
 
   # Build!
-
   make ${MAKEFLAGS} uImage modules
 }
 
@@ -200,7 +199,7 @@ package_kernel26-headers() {
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 
-  # Add in scsi.h (Plugbox)
+  # Add in scsi.h (Plugbox Linux)
   mkdir -p ${pkgdir}/usr/include/scsi
   cp ${srcdir}/linux-${_basekernel}/include/scsi/scsi.h ${pkgdir}/usr/include/scsi/
 }
diff --git a/core/kernel26/kernel26.install b/core/kernel26/kernel26.install
index 590314530..6161f2c97 100644
--- a/core/kernel26/kernel26.install
+++ b/core/kernel26/kernel26.install
@@ -1,9 +1,17 @@
+KERNEL_NAME=
+KERNEL_VERSION=2.6.37-ARCH
+
 post_install() {
+# ARM doesn't use mkinitcpio or anything like that
+# so we skip it here
 echo -e "\033[1mNotice\033[0m"
 echo "If you have a SheevaPlug, you will have to copy"
-echo "/boot/uImage to the proper location, e.g. mmcblk0p1."
+echo "/boot/uImage to the proper location, e.g. /dev/mmcblk0p1"
+echo "after removing the old one."
 echo ""
-echo "This package is for all plugs, including the DockStar."
+echo "If you boot from USB, you do not need 
+echo ""
+echo "This package is for all plugs, including the Dockstar."
 echo ""
 echo "Installing now..."
 }
@@ -13,7 +21,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  KERNEL_VERSION=2.6.36
+  KERNEL_VERSION=2.6.37
 }
 
 op=$1