diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 0d3b40e16f44f73fcaf5e05b9c36876dd79200b6..69e602aded1a0dcf62dfc5af1047c1babe2e5322 100644
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -110,7 +110,8 @@ define BuildKernel
 
   ifeq ($(DUMP),1)
     dumpinfo:
-		@echo 'Target: $(BOARD)-$(KERNEL)'
+		@echo 'Target: $(BOARD)'
+		@echo 'Target-Kernel: $(KERNEL)'
 		@echo 'Target-Name: $(BOARDNAME) [$(KERNEL)]'
 		@echo 'Target-Path: $(subst $(TOPDIR)/,,$(PWD))'
 		@echo 'Target-Arch: $(ARCH)'
diff --git a/include/kernel.mk b/include/kernel.mk
index a0f256b998c32345e9cb5bdf774f3d6253628b9d..559b37e4a31a6d7000a773ae3acebda4d34b3446 100644
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -30,9 +30,9 @@ else
     KERNEL_CROSS:=$(TARGET_CROSS)
   endif
 
-  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)
+  PLATFORM_DIR := $(TOPDIR)/target/linux/$(BOARD)
   PATCH_DIR ?= ./patches$(shell [ -d "./patches-$(KERNEL_PATCHVER)" ] && printf -- "-$(KERNEL_PATCHVER)" || true )
-  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(KERNEL)-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+  KERNEL_BUILD_DIR ?= $(BUILD_DIR_BASE)/linux-$(BOARD)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
   LINUX_DIR ?= $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 
   MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)
diff --git a/include/toplevel.mk b/include/toplevel.mk
index e45626422157bb78cef15a5c798296b80f1abda9..8faf8e14372a396b93ab11f4a5fa942544d7d4f3 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -122,7 +122,7 @@ distclean:
 	rm -rf tmp build_dir staging_dir dl .config*
 
 ifeq ($(findstring v,$(DEBUG)),)
-  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package tmp/.prereq-target prepare-tmpinfo
+  .SILENT: symlinkclean clean dirclean distclean config-clean download help tmpinfo-clean .config scripts/config/mconf scripts/config/conf menuconfig tmp/.prereq-build tmp/.prereq-package prepare-tmpinfo
 endif
 .PHONY: help FORCE
 .NOTPARALLEL:
diff --git a/package/acx/Makefile b/package/acx/Makefile
index 48d27e5f626dca77188af6b2edcc6079c627b4e5..7684cb92ec910d9981e07a2c1158f0e340a03bdf 100644
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/acx
   TITLE:=Driver for TI ACX1xx chipset
-  DEPENDS:=@LINUX_2_6&&!LINUX_2_6_AVR32 +wireless-tools
+  DEPENDS:=@LINUX_2_6 @!TARGET_AVR32 +wireless-tools
   DESCRIPTION:=\
 	This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
   URL:=http://acx100.sourceforge.net/
diff --git a/package/admswconfig/Makefile b/package/admswconfig/Makefile
index 10ab5895f1d770a306cc49cf1f90ee7d050826f0..609c2e1cf77c87643ddf4ff32ff76f8645b60603 100644
--- a/package/admswconfig/Makefile
+++ b/package/admswconfig/Makefile
@@ -24,7 +24,7 @@ define Package/admswconfig
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=ADM5120 Switch configuration tool
-  DEPENDS:=@LINUX_2_6_ADM5120||@LINUX_2_6_ADM5120EB
+  DEPENDS:=@TARGET_ADM5120||TARGET_ADM5120EB
   DESCRIPTION:=\
 	A program to configure the internal ethernet switch of an ADM5120 processor. \\\
 	You need the corresponding driver for the switch in the kernel. \\\
diff --git a/package/ar7-atm/Makefile b/package/ar7-atm/Makefile
index 756657db3fd6631a6465ca784a7859f68a72c5f6..3be0fab3a96076912bf5b823c16cdef90830b64c 100644
--- a/package/ar7-atm/Makefile
+++ b/package/ar7-atm/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/sangam-atm-annex-a
   SUBMENU:=Network Devices
-  DEPENDS:=@LINUX_2_6_AR7 +kmod-atm 
+  DEPENDS:=@TARGET_AR7 +kmod-atm 
   TITLE:=AR7 ADSL driver (Annex A, ADSL over POTS)
   DESCRIPTION:=The AR7 ADSL driver for Annex A (ADSL over POTS)
   FILES:=$(PKG_BUILD_DIR)/tiatm.$(LINUX_KMOD_SUFFIX)
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 987bb5d54b9312e3d80bf72dc298143fbab8721e..9acb8dfd98f585e9d4a197a684537fb6ac4dc9ea 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -69,7 +69,7 @@ endef
 define Package/libgcc
   $(call Package/gcc/Default)
   TITLE:=GCC support library
-  DEPENDS:=@!LINUX_2_6_AVR32||@!NATIVE_TOOLCHAIN
+  DEPENDS:=@!TARGET_AVR32 @!NATIVE_TOOLCHAIN
 endef
 
 define Package/libssp
diff --git a/package/bcm43xx-mac80211/Makefile b/package/bcm43xx-mac80211/Makefile
index 236244442f55aa417c0da0a3142c62c23fa17d5f..54f5a9794dc8fc27f5f7d238ec0fe2d83cf0b699 100644
--- a/package/bcm43xx-mac80211/Makefile
+++ b/package/bcm43xx-mac80211/Makefile
@@ -21,7 +21,7 @@ define KernelPackage/bcm43xx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Broadcom 43xx wireless support
   DESCRIPTION:=Kernel module for Broadcom 43xx wireless support (mac80211)
-  DEPENDS:=@LINUX_2_6_BRCM47XX +kmod-mac80211
+  DEPENDS:=@TARGET_BRCM47XX +kmod-mac80211
   KCONFIG:=CONFIG_MAC80211
   FILES:=$(PKG_BUILD_DIR)/bcm43xx-mac80211.$(LINUX_KMOD_SUFFIX)
 #  AUTOLOAD:=$(call AutoLoad,30,bcm43xx-mac80211)
diff --git a/package/broadcom-diag/Makefile b/package/broadcom-diag/Makefile
index f2337a2a67eb5d87e49a1a31ee91d2c442603fe0..e0827b0fbc3b93cf6801ea3f6e1d91b613b6e5f6 100644
--- a/package/broadcom-diag/Makefile
+++ b/package/broadcom-diag/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/diag
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_6_BRCM||LINUX_2_6_BRCM47XX
+  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX
   TITLE:=Driver for router LEDs and Buttons
   FILES:=$(PKG_BUILD_DIR)/diag.$(LINUX_KMOD_SUFFIX)
 endef
diff --git a/package/broadcom-mmc/Makefile b/package/broadcom-mmc/Makefile
index 57db0d67d7d0a97bc5579c87e13db1221e16f39f..889bcfa01126dcc7858136f8f5c2f921b1e302f3 100644
--- a/package/broadcom-mmc/Makefile
+++ b/package/broadcom-mmc/Makefile
@@ -23,7 +23,7 @@ MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
 
 define KernelPackage/broadcom-mmc
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_4_BRCM
+  DEPENDS:=@TARGET_BRCM_2_4
   TITLE:=Kernel driver for the Linksys WRT54G MM/SD-Card Mod
   DESCRIPTION:=\
 	Kernel driver for the Linksys WRT54G MM/SD-Card Mod
diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index da32a89312fb36fda39de926e1b0d0d8564dc45f..77d599552f21c46af14bdc0e15add81213fee331 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -25,13 +25,13 @@ define Package/broadcom-wl/Default
   CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=@LINUX_2_4_BRCM
+  SUBMENUDEP:=@TARGET_BRCM_2_4
 endef
 
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
-  DEPENDS:=@LINUX_2_4_BRCM
+  DEPENDS:=@TARGET_BRCM_2_4
   TITLE:=Kernel driver for BCM43xx chipsets
   DESCRIPTION:=\
 	This package contains the proprietary wireless driver for the Broadcom \\\
diff --git a/package/fonera-mp3-drv/Makefile b/package/fonera-mp3-drv/Makefile
index d163b4acc1bb171f237e91e09401c709292d60da..997b85afeaac2424bc78d7e753aca2b099e0a987 100644
--- a/package/fonera-mp3-drv/Makefile
+++ b/package/fonera-mp3-drv/Makefile
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/fonera-mp3-driver
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6_ATHEROS
+  DEPENDS:=@TARGET_ATHEROS
   TITLE:=Fonera-MP3 driver (VS1011X)
   DESCRIPTION:=driver for a vs1011X attached to a fonera
   FILES:=$(PKG_BUILD_DIR)/mp3_drv.$(LINUX_KMOD_SUFFIX)
diff --git a/package/fonera-mp3/Makefile b/package/fonera-mp3/Makefile
index dabef8355396d56c2a260c48c4f3b94db55baed6..c41d6f8598a11a0dbf80c3c27f5d24c385c46fe2 100644
--- a/package/fonera-mp3/Makefile
+++ b/package/fonera-mp3/Makefile
@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/fonera-mp3d
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6_ATHEROS
+  DEPENDS:=@TARGET_ATHEROS
   TITLE:=Daemon for fonera-mp3
   DESCRIPTION:=Daemon to drive a vs1011X mp3 decoder attached to the \
 	  fonera gpio pins
diff --git a/package/foxboard-utils/Makefile b/package/foxboard-utils/Makefile
index f5d9aa7934a3acb121d58b3d43059df2466725ec..fc63e0c2319cc7b8640b01f105d6c66dc6040450 100644
--- a/package/foxboard-utils/Makefile
+++ b/package/foxboard-utils/Makefile
@@ -27,7 +27,7 @@ define Package/foxboard-utils
   DESCRIPTION:=\
 	This package contains a collection of tools for configuring the foxboard gpio pins/leds 
   URL:=http://www.acmesystems.it
-  DEPENDS:=@LINUX_2_6_ETRAX
+  DEPENDS:=@TARGET_ETRAX
 endef
 
 define Build/Compile
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 22f0dab7464cd0495d58de09e9f05734c6906bf2..a4acb517122a2783114a6b761f6b831cdb47f0ba 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -36,7 +36,7 @@ endef
 
 define Package/hostapd
   $(call Package/hostapd/Default)
-  DEPENDS:=+libopenssl @!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX
+  DEPENDS:=+libopenssl @!TARGET_AVR32 @!TARGET_ETRAX
   TITLE+= (full)
   DESCRIPTION:=\
 	This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\
@@ -49,7 +49,7 @@ endef
 
 define Package/hostapd-mini
   $(call Package/hostapd/Default)
-  DEPENDS:=@!LINUX_2_6_AVR32 @!LINUX_2_6_ETRAX
+  DEPENDS:=@!TARGET_AVR32 @!TARGET_ETRAX
   TITLE+= (WPA-PSK only)
   DESCRIPTION:=\
 	This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 62e63d36ee328ec8ebd5fe9d3cf92b1eafed48fe..700b805ee0f61da4f53ddeae184b55ac84f7e900 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ipset
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@!LINUX_2_6_ETRAX
+  DEPENDS:=@!TARGET_ETRAX
   TITLE:=Netfilter ip sets administration utility
   URL:=http://ipset.netfilter.org/
 endef
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 7289930812785726f3fb4013d5ce1556cdca30b0..7a187404d582a61e8b4601e149b917f7fb449835 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/kexec-tools
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6_X86||@LINUX_2_6_RDC +zlib
+  DEPENDS:=@i386 +zlib
   TITLE:=Kernel boots kernel
   DESCRIPTION:=\
 	kexec is a set of systems call that allows you to load \\\
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 70177d960597dba45ee0a28f10d850efceb0015e..2770c3d68a7483a18ae573e964622b10cee2a7e7 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -43,13 +43,10 @@ ifeq ($(ARCH),powerpc)
 endif
 
 BUS:=PCI
-ifneq ($(CONFIG_LINUX_2_6_ATHEROS),)
+ifneq ($(CONFIG_TARGET_ATHEROS),)
   BUS:=AHB
   HAL_TARGET:=ap51
 endif
-ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
-  BUS:=PCI AHB	# no suitable HAL for AHB yet.
-endif
 
 BUS_MODULES:=
 ifeq ($(findstring AHB,$(BUS)),AHB)
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 486e419ac9551b26dc336c2f85770a3e1d0b70f1..e7a59a70b6f08464dbbfcfc37243e5bf256672e3 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/nvram
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_4_BRCM
+  DEPENDS:=@TARGET_BRCM_2_4
   TITLE:=Broadcom config utility
   DESCRIPTION:=\
 	This package contains an utility to control broadcom's 'nvram' config \\\
diff --git a/package/qc-usb/Makefile b/package/qc-usb/Makefile
index a28d439867e7c13a33604b7188b9c41ee906bb08..795ba96e823b123d01d9a9aa78ec91b17c99db1d 100644
--- a/package/qc-usb/Makefile
+++ b/package/qc-usb/Makefile
@@ -36,7 +36,7 @@ define KernelPackage/usb-qc
 	Kernel support for Logitech's QuickCam Express webcam and \\\
 	other webcams with similar chipsets.
   SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 @USB_SUPPORT @VIDEO_SUPPORT kmod-usb-core +kmod-videodev
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT kmod-usb-core +kmod-videodev
   FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,90,quickcam)
 endef
diff --git a/package/switch/Makefile b/package/switch/Makefile
index 0f3716c29a1e865eb71638a5d1e8e28e01aea925..dd09248720c198d231ea2c2bcc34283b7d550bdd 100644
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/switch
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM||LINUX_2_6_BRCM47XX
+  DEPENDS:=@TARGET_BRCM_2_4||TARGET_BRCM47XX
   TITLE:=Switch drivers
   DESCRIPTION:=\
 	This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch.
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index c5c574c4bbe4fb661bfdd1fc94906fc1afe35e7e..40f443eac33e255003b321874a593b377480383b 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/util-linux/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@!LINUX_2_6_ETRAX
+  DEPENDS:=@!TARGET_ETRAX
   URL:=http://www.kernel.org/pub/linux/utils/util-linux/
 endef
 
diff --git a/package/uvcvideo/Makefile b/package/uvcvideo/Makefile
index 847f73b2074b6b1a5f9700d8de3dfa7026f99096..c08f565d7f29e7f9effe9678deb062eb7fa1c610 100644
--- a/package/uvcvideo/Makefile
+++ b/package/uvcvideo/Makefile
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/uvcvideo
   SUBMENU:=USB Support
-  DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev @VIDEO_SUPPORT
+  DEPENDS:=@LINUX_2_6 kmod-usb-core kmod-videodev
   TITLE:=Driver for Linux-UVC based USB cameras
   URL:=http://linux-uvc.berlios.de/
   FILES:=$(PKG_BUILD_DIR)/uvcvideo.$(LINUX_KMOD_SUFFIX)
diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile
index 2c361b7fc3861fd9f3680bf7f5e393d7c068cce6..78e3c0fcfd8998355f69686f8dbb67f5cedbee26 100644
--- a/package/wlcompat/Makefile
+++ b/package/wlcompat/Makefile
@@ -16,8 +16,8 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/wlcompat/Default
   SUBMENU:=Proprietary BCM43xx WiFi driver
-  SUBMENUDEP:=@LINUX_2_4_BRCM
-  DEPENDS:=@LINUX_2_4_BRCM @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools
+  SUBMENUDEP:=@TARGET_BRCM_2_4
+  DEPENDS:=@TARGET_BRCM_2_4 @PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +wireless-tools
   TITLE:=Broadcom wl wrapper module
   DESCRIPTION:=\
 	This package contains a wrapper module, that provides Wireless Extension \\\
diff --git a/package/yamonenv/Makefile b/package/yamonenv/Makefile
index 7cfe6092d96c9be305cfc8ed63a6444a77c65339..0cf6493e2de903320d7696f25d75bb65e7293063 100644
--- a/package/yamonenv/Makefile
+++ b/package/yamonenv/Makefile
@@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/yamonenv
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=@LINUX_2_6_AU1000
+  DEPENDS:=@TARGET_AU1000
   TITLE:=YAMON configuration utility
   URL:=http://meshcube.org/nylon/stable/sources/
 endef
diff --git a/package/zd1211-driver/Makefile b/package/zd1211-driver/Makefile
index 1790941bb34cdb9c77ce38b9886ae727f4d489a2..d61cc7ba202c3ca538178632656fed6755e43dce 100644
--- a/package/zd1211-driver/Makefile
+++ b/package/zd1211-driver/Makefile
@@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk
 #FIXME: add proper dependency handling on kmod-usb-core packages
 define KernelPackage/zd1211
   SUBMENU:=Wireless Drivers
-  DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML
+  DEPENDS:=@LINUX_2_6 @USB_SUPPORT
   TITLE:=Driver for Zydas 1211 based USB devices
   DESCRIPTION:=\
 	This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index 9b983545f2db8276d1672ea629b13d8b5155c874..fe135418ca1becae3ca613353f061a51bca7f3b3 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -22,18 +22,17 @@ sub parse_target_metadata() {
 	my ($target, @target, $profile);	
 	while (<>) {
 		chomp;
-		/^Target:\s*((.+)-(\d+\.\d+))\s*$/ and do {
-			my $conf = uc $3.'_'.$2;
+		/^Target:\s*(.+)\s*$/ and do {
+			my $conf = uc $1;
 			$conf =~ tr/\.-/__/;
 			$target = {
-				id => $1,
 				conf => $conf,
-				board => $2,
-				kernel => $3,
+				board => $1,
 				profiles => []
 			};
 			push @target, $target;
 		};
+		/^Target-Kernel:\s*(\d+\.\d+)\s*$/ and $target->{kernel} = $1;
 		/^Target-Name:\s*(.+)\s*$/ and $target->{name} = $1;
 		/^Target-Path:\s*(.+)\s*$/ and $target->{path} = $1;
 		/^Target-Arch:\s*(.+)\s*$/ and $target->{arch} = $1;
@@ -203,27 +202,25 @@ sub gen_target_mk() {
 	my @target = parse_target_metadata();
 	
 	@target = sort {
-		$a->{id} cmp $b->{id}
+		$a->{board} cmp $b->{board}
 	} @target;
 	
 	foreach my $target (@target) {
 		my ($profiles_def, $profiles_eval);
-		my $conf = uc $target->{kernel}.'_'.$target->{board};
-		$conf =~ tr/\.-/__/;
-		
+
 		foreach my $profile (@{$target->{profiles}}) {
 			$profiles_def .= "
-  define Profile/$conf\_$profile->{id}
+  define Profile/$target->{conf}\_$profile->{id}
     ID:=$profile->{id}
     NAME:=$profile->{name}
     PACKAGES:=".join(" ", merge_package_lists($target->{packages}, $profile->{packages}))."\n";
 			$profile->{kconfig} and $profiles_def .= "    KCONFIG:=1\n";
 			$profiles_def .= "  endef";
 			$profiles_eval .= "
-\$(eval \$(call AddProfile,$conf\_$profile->{id}))"
+\$(eval \$(call AddProfile,$target->{conf}\_$profile->{id}))"
 		}
 		print "
-ifeq (\$(CONFIG_LINUX_$conf),y)
+ifeq (\$(CONFIG_TARGET_$target->{conf}),y)
   define Target
     KERNEL:=$target->{kernel}
     BOARD:=$target->{board}
@@ -268,7 +265,7 @@ sub gen_target_config() {
 	print <<EOF;
 choice
 	prompt "Target System"
-	default LINUX_2_4_BRCM
+	default TARGET_BRCM_2_4
 	reset if !DEVEL
 	
 EOF
@@ -289,7 +286,7 @@ EOF
 		}
 	
 		print <<EOF
-config LINUX_$target->{conf}
+config TARGET_$target->{conf}
 	bool "$target->{name}"
 	select $target->{arch}
 	select LINUX_$kernel
@@ -299,58 +296,6 @@ EOF
 	}
 
 	print <<EOF;
-if DEVEL
-
-config LINUX_2_6_ARM
-	bool "UNSUPPORTED little-endian arm platform"
-	depends BROKEN
-	select LINUX_2_6
-	select arm
-
-config LINUX_2_6_CRIS
-	bool "UNSUPPORTED cris platform"
-	depends BROKEN
-	select LINUX_2_6
-	select cris
-
-config LINUX_2_6_M68K
-	bool "UNSUPPORTED m68k platform"
-	depends BROKEN
-	select LINUX_2_6
-	select m68k
-
-config LINUX_2_6_SH3
-	bool "UNSUPPORTED little-endian sh3 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh3
-
-config LINUX_2_6_SH3EB
-	bool "UNSUPPORTED big-endian sh3 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh3eb
-
-config LINUX_2_6_SH4
-	bool "UNSUPPORTED little-endian sh4 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh4
-
-config LINUX_2_6_SH4EB
-	bool "UNSUPPORTED big-endian sh4 platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sh4eb
-
-config LINUX_2_6_SPARC
-	bool "UNSUPPORTED sparc platform"
-	depends BROKEN
-	select LINUX_2_6
-	select sparc
-
-endif
-
 endchoice
 
 choice
@@ -363,9 +308,9 @@ EOF
 		
 		foreach my $profile (@$profiles) {
 			print <<EOF;
-config LINUX_$target->{conf}_$profile->{id}
+config TARGET_$target->{conf}_$profile->{id}
 	bool "$profile->{name}"
-	depends LINUX_$target->{conf}
+	depends TARGET_$target->{conf}
 $profile->{config}
 EOF
 			$profile->{kconfig} and print "\tselect PROFILE_KCONFIG\n";
diff --git a/target/linux/Makefile b/target/linux/Makefile
index 608cfa8eb06e8be63b44f9bb245f93e3036da14c..1eb579e82e98b4afa916b59a88d2eb2130479f9b 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -8,5 +8,5 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 prereq clean download prepare compile install menuconfig oldconfig update refresh: FORCE
-	$(MAKE) -C $(BOARD)-$(KERNEL) $@
+	$(MAKE) -C $(BOARD) $@
 
diff --git a/target/linux/adm5120-2.6/Makefile b/target/linux/adm5120/Makefile
similarity index 100%
rename from target/linux/adm5120-2.6/Makefile
rename to target/linux/adm5120/Makefile
diff --git a/target/linux/adm5120-2.6/base-files/default/sbin/wget2nand b/target/linux/adm5120/base-files/default/sbin/wget2nand
similarity index 100%
rename from target/linux/adm5120-2.6/base-files/default/sbin/wget2nand
rename to target/linux/adm5120/base-files/default/sbin/wget2nand
diff --git a/target/linux/adm5120-2.6/config/default b/target/linux/adm5120/config/default
similarity index 100%
rename from target/linux/adm5120-2.6/config/default
rename to target/linux/adm5120/config/default
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig b/target/linux/adm5120/files/arch/mips/adm5120/Kconfig
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/Kconfig
rename to target/linux/adm5120/files/arch/mips/adm5120/Kconfig
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/Makefile b/target/linux/adm5120/files/arch/mips/adm5120/Makefile
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/Makefile
rename to target/linux/adm5120/files/arch/mips/adm5120/Makefile
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c b/target/linux/adm5120/files/arch/mips/adm5120/adm5120_info.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/adm5120_info.c
rename to target/linux/adm5120/files/arch/mips/adm5120/adm5120_info.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/board.c b/target/linux/adm5120/files/arch/mips/adm5120/board.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/board.c
rename to target/linux/adm5120/files/arch/mips/adm5120/board.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/Makefile b/target/linux/adm5120/files/arch/mips/adm5120/boards/Makefile
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/Makefile
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/Makefile
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/cellvision.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/cellvision.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/cellvision.c
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/cellvision.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/compex.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/compex.c
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/compex.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/edimax.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/edimax.c
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/edimax.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/generic.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/generic.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/generic.c
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/generic.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/infineon.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/infineon.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/infineon.c
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/infineon.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/mikrotik.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/mikrotik.c
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/mikrotik.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/zyxel.c b/target/linux/adm5120/files/arch/mips/adm5120/boards/zyxel.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/zyxel.c
rename to target/linux/adm5120/files/arch/mips/adm5120/boards/zyxel.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/clock.c b/target/linux/adm5120/files/arch/mips/adm5120/clock.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/clock.c
rename to target/linux/adm5120/files/arch/mips/adm5120/clock.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/gpio.c b/target/linux/adm5120/files/arch/mips/adm5120/gpio.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/gpio.c
rename to target/linux/adm5120/files/arch/mips/adm5120/gpio.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/irq.c b/target/linux/adm5120/files/arch/mips/adm5120/irq.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/irq.c
rename to target/linux/adm5120/files/arch/mips/adm5120/irq.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/memory.c b/target/linux/adm5120/files/arch/mips/adm5120/memory.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/memory.c
rename to target/linux/adm5120/files/arch/mips/adm5120/memory.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/platform.c b/target/linux/adm5120/files/arch/mips/adm5120/platform.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/platform.c
rename to target/linux/adm5120/files/arch/mips/adm5120/platform.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c b/target/linux/adm5120/files/arch/mips/adm5120/prom.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom.c
rename to target/linux/adm5120/files/arch/mips/adm5120/prom.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/Makefile b/target/linux/adm5120/files/arch/mips/adm5120/prom/Makefile
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/Makefile
rename to target/linux/adm5120/files/arch/mips/adm5120/prom/Makefile
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/bootbase.c b/target/linux/adm5120/files/arch/mips/adm5120/prom/bootbase.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/bootbase.c
rename to target/linux/adm5120/files/arch/mips/adm5120/prom/bootbase.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/cfe.c b/target/linux/adm5120/files/arch/mips/adm5120/prom/cfe.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/cfe.c
rename to target/linux/adm5120/files/arch/mips/adm5120/prom/cfe.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/generic.c b/target/linux/adm5120/files/arch/mips/adm5120/prom/generic.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/generic.c
rename to target/linux/adm5120/files/arch/mips/adm5120/prom/generic.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/myloader.c b/target/linux/adm5120/files/arch/mips/adm5120/prom/myloader.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/myloader.c
rename to target/linux/adm5120/files/arch/mips/adm5120/prom/myloader.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/prom_read.h b/target/linux/adm5120/files/arch/mips/adm5120/prom/prom_read.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/prom_read.h
rename to target/linux/adm5120/files/arch/mips/adm5120/prom/prom_read.h
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/routerboot.c b/target/linux/adm5120/files/arch/mips/adm5120/prom/routerboot.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/prom/routerboot.c
rename to target/linux/adm5120/files/arch/mips/adm5120/prom/routerboot.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/reset.c b/target/linux/adm5120/files/arch/mips/adm5120/reset.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/reset.c
rename to target/linux/adm5120/files/arch/mips/adm5120/reset.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c b/target/linux/adm5120/files/arch/mips/adm5120/setup.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/setup.c
rename to target/linux/adm5120/files/arch/mips/adm5120/setup.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/time.c b/target/linux/adm5120/files/arch/mips/adm5120/time.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/time.c
rename to target/linux/adm5120/files/arch/mips/adm5120/time.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/adm5120/trxsplit.c b/target/linux/adm5120/files/arch/mips/adm5120/trxsplit.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/adm5120/trxsplit.c
rename to target/linux/adm5120/files/arch/mips/adm5120/trxsplit.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/pci/fixup-adm5120.c b/target/linux/adm5120/files/arch/mips/pci/fixup-adm5120.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/pci/fixup-adm5120.c
rename to target/linux/adm5120/files/arch/mips/pci/fixup-adm5120.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/pci/ops-adm5120.c b/target/linux/adm5120/files/arch/mips/pci/ops-adm5120.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/pci/ops-adm5120.c
rename to target/linux/adm5120/files/arch/mips/pci/ops-adm5120.c
diff --git a/target/linux/adm5120-2.6/files/arch/mips/pci/pci-adm5120.c b/target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/arch/mips/pci/pci-adm5120.c
rename to target/linux/adm5120/files/arch/mips/pci/pci-adm5120.c
diff --git a/target/linux/adm5120-2.6/files/drivers/leds/leds-adm5120.c b/target/linux/adm5120/files/drivers/leds/leds-adm5120.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/leds/leds-adm5120.c
rename to target/linux/adm5120/files/drivers/leds/leds-adm5120.c
diff --git a/target/linux/adm5120-2.6/files/drivers/leds/leds-gpio.c b/target/linux/adm5120/files/drivers/leds/leds-gpio.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/leds/leds-gpio.c
rename to target/linux/adm5120/files/drivers/leds/leds-gpio.c
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120-flash.c b/target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/mtd/maps/adm5120-flash.c
rename to target/linux/adm5120/files/drivers/mtd/maps/adm5120-flash.c
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/myloader.c b/target/linux/adm5120/files/drivers/mtd/myloader.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/mtd/myloader.c
rename to target/linux/adm5120/files/drivers/mtd/myloader.c
diff --git a/target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c b/target/linux/adm5120/files/drivers/mtd/nand/rbmipsnand.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c
rename to target/linux/adm5120/files/drivers/mtd/nand/rbmipsnand.c
diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c b/target/linux/adm5120/files/drivers/net/adm5120sw.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/net/adm5120sw.c
rename to target/linux/adm5120/files/drivers/net/adm5120sw.c
diff --git a/target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h b/target/linux/adm5120/files/drivers/net/adm5120sw.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/net/adm5120sw.h
rename to target/linux/adm5120/files/drivers/net/adm5120sw.h
diff --git a/target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c b/target/linux/adm5120/files/drivers/serial/adm5120_uart.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/serial/adm5120_uart.c
rename to target/linux/adm5120/files/drivers/serial/adm5120_uart.c
diff --git a/target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c b/target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c
similarity index 100%
rename from target/linux/adm5120-2.6/files/drivers/usb/host/adm5120-hcd.c
rename to target/linux/adm5120/files/drivers/usb/host/adm5120-hcd.c
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_board.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_board.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_board.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_board.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_defs.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_defs.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_defs.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_info.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_info.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_info.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_info.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_intc.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_intc.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_intc.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_intc.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_irq.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_irq.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_irq.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_irq.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_mpmc.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_mpmc.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_mpmc.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_mpmc.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_platform.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_platform.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_platform.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_platform.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_switch.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_switch.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_switch.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_uart.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_uart.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_uart.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/adm5120_uart.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/asm/sizes.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/asm/sizes.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/asm/sizes.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/asm/sizes.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/cpu-feature-overrides.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/gpio.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/gpio.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/gpio.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/gpio.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/cfe.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/cfe.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/cfe.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/cfe.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/generic.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/generic.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/generic.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/generic.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/myloader.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/myloader.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/myloader.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/myloader.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/routerboot.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/routerboot.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/routerboot.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/routerboot.h
diff --git a/target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/zynos.h b/target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/zynos.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/prom/zynos.h
rename to target/linux/adm5120/files/include/asm-mips/mach-adm5120/prom/zynos.h
diff --git a/target/linux/adm5120-2.6/files/include/linux/gpio_leds.h b/target/linux/adm5120/files/include/linux/gpio_leds.h
similarity index 100%
rename from target/linux/adm5120-2.6/files/include/linux/gpio_leds.h
rename to target/linux/adm5120/files/include/linux/gpio_leds.h
diff --git a/target/linux/adm5120-2.6/image/Makefile b/target/linux/adm5120/image/Makefile
similarity index 100%
rename from target/linux/adm5120-2.6/image/Makefile
rename to target/linux/adm5120/image/Makefile
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/Makefile b/target/linux/adm5120/image/lzma-loader/Makefile
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/Makefile
rename to target/linux/adm5120/image/lzma-loader/Makefile
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/LzmaDecode.c b/target/linux/adm5120/image/lzma-loader/src/LzmaDecode.c
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/LzmaDecode.c
rename to target/linux/adm5120/image/lzma-loader/src/LzmaDecode.c
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/LzmaDecode.h b/target/linux/adm5120/image/lzma-loader/src/LzmaDecode.h
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/LzmaDecode.h
rename to target/linux/adm5120/image/lzma-loader/src/LzmaDecode.h
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/Makefile b/target/linux/adm5120/image/lzma-loader/src/Makefile
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/Makefile
rename to target/linux/adm5120/image/lzma-loader/src/Makefile
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/README b/target/linux/adm5120/image/lzma-loader/src/README
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/README
rename to target/linux/adm5120/image/lzma-loader/src/README
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/board.c b/target/linux/adm5120/image/lzma-loader/src/board.c
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/board.c
rename to target/linux/adm5120/image/lzma-loader/src/board.c
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/config.h b/target/linux/adm5120/image/lzma-loader/src/config.h
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/config.h
rename to target/linux/adm5120/image/lzma-loader/src/config.h
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c b/target/linux/adm5120/image/lzma-loader/src/decompress.c
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/decompress.c
rename to target/linux/adm5120/image/lzma-loader/src/decompress.c
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/head.S b/target/linux/adm5120/image/lzma-loader/src/head.S
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/head.S
rename to target/linux/adm5120/image/lzma-loader/src/head.S
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds b/target/linux/adm5120/image/lzma-loader/src/loader.lds
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/loader.lds
rename to target/linux/adm5120/image/lzma-loader/src/loader.lds
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds b/target/linux/adm5120/image/lzma-loader/src/lzma-data.lds
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/lzma-data.lds
rename to target/linux/adm5120/image/lzma-loader/src/lzma-data.lds
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/printf.c b/target/linux/adm5120/image/lzma-loader/src/printf.c
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/printf.c
rename to target/linux/adm5120/image/lzma-loader/src/printf.c
diff --git a/target/linux/adm5120-2.6/image/lzma-loader/src/printf.h b/target/linux/adm5120/image/lzma-loader/src/printf.h
similarity index 100%
rename from target/linux/adm5120-2.6/image/lzma-loader/src/printf.h
rename to target/linux/adm5120/image/lzma-loader/src/printf.h
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/001-adm5120.patch b/target/linux/adm5120/patches-2.6.22/001-adm5120.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/001-adm5120.patch
rename to target/linux/adm5120/patches-2.6.22/001-adm5120.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/002-adm5120_flash.patch b/target/linux/adm5120/patches-2.6.22/002-adm5120_flash.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/002-adm5120_flash.patch
rename to target/linux/adm5120/patches-2.6.22/002-adm5120_flash.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.22/003-adm5120_switch.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/003-adm5120_switch.patch
rename to target/linux/adm5120/patches-2.6.22/003-adm5120_switch.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/004-adm5120_nand.patch b/target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/004-adm5120_nand.patch
rename to target/linux/adm5120/patches-2.6.22/004-adm5120_nand.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/005-adm5120_usb.patch b/target/linux/adm5120/patches-2.6.22/005-adm5120_usb.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/005-adm5120_usb.patch
rename to target/linux/adm5120/patches-2.6.22/005-adm5120_usb.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/006-adm5120_leds.patch b/target/linux/adm5120/patches-2.6.22/006-adm5120_leds.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/006-adm5120_leds.patch
rename to target/linux/adm5120/patches-2.6.22/006-adm5120_leds.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.22/007-adm5120_pci.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/007-adm5120_pci.patch
rename to target/linux/adm5120/patches-2.6.22/007-adm5120_pci.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/008-adm5120_uart.patch b/target/linux/adm5120/patches-2.6.22/008-adm5120_uart.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/008-adm5120_uart.patch
rename to target/linux/adm5120/patches-2.6.22/008-adm5120_uart.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/100-mtd_myloder_partition_parser.patch b/target/linux/adm5120/patches-2.6.22/100-mtd_myloder_partition_parser.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/100-mtd_myloder_partition_parser.patch
rename to target/linux/adm5120/patches-2.6.22/100-mtd_myloder_partition_parser.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.22/101-cfi_fixup_macronix_bootloc.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/101-cfi_fixup_macronix_bootloc.patch
rename to target/linux/adm5120/patches-2.6.22/101-cfi_fixup_macronix_bootloc.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches-2.6.22/102-jedec_pmc_39lvxxx_chips.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/102-jedec_pmc_39lvxxx_chips.patch
rename to target/linux/adm5120/patches-2.6.22/102-jedec_pmc_39lvxxx_chips.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/140-cmdline_hack.patch b/target/linux/adm5120/patches-2.6.22/140-cmdline_hack.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/140-cmdline_hack.patch
rename to target/linux/adm5120/patches-2.6.22/140-cmdline_hack.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/200-amba_pl010_hacks.patch b/target/linux/adm5120/patches-2.6.22/200-amba_pl010_hacks.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/200-amba_pl010_hacks.patch
rename to target/linux/adm5120/patches-2.6.22/200-amba_pl010_hacks.patch
diff --git a/target/linux/adm5120-2.6/patches-2.6.22/201-amba_bus_hacks.patch b/target/linux/adm5120/patches-2.6.22/201-amba_bus_hacks.patch
similarity index 100%
rename from target/linux/adm5120-2.6/patches-2.6.22/201-amba_bus_hacks.patch
rename to target/linux/adm5120/patches-2.6.22/201-amba_bus_hacks.patch
diff --git a/target/linux/adm5120-2.6/profiles/100-Atheros.mk b/target/linux/adm5120/profiles/100-Atheros.mk
similarity index 100%
rename from target/linux/adm5120-2.6/profiles/100-Atheros.mk
rename to target/linux/adm5120/profiles/100-Atheros.mk
diff --git a/target/linux/adm5120-2.6/profiles/105-Texas.mk b/target/linux/adm5120/profiles/105-Texas.mk
similarity index 100%
rename from target/linux/adm5120-2.6/profiles/105-Texas.mk
rename to target/linux/adm5120/profiles/105-Texas.mk
diff --git a/target/linux/adm5120-2.6/profiles/110-Ralink.mk b/target/linux/adm5120/profiles/110-Ralink.mk
similarity index 100%
rename from target/linux/adm5120-2.6/profiles/110-Ralink.mk
rename to target/linux/adm5120/profiles/110-Ralink.mk
diff --git a/target/linux/adm5120-2.6/profiles/200-None.mk b/target/linux/adm5120/profiles/200-None.mk
similarity index 100%
rename from target/linux/adm5120-2.6/profiles/200-None.mk
rename to target/linux/adm5120/profiles/200-None.mk
diff --git a/target/linux/adm5120-2.6/profiles/Cellvision.mk b/target/linux/adm5120/profiles/Cellvision.mk
similarity index 100%
rename from target/linux/adm5120-2.6/profiles/Cellvision.mk
rename to target/linux/adm5120/profiles/Cellvision.mk
diff --git a/target/linux/adm5120-2.6/profiles/RB1xx.mk b/target/linux/adm5120/profiles/RB1xx.mk
similarity index 100%
rename from target/linux/adm5120-2.6/profiles/RB1xx.mk
rename to target/linux/adm5120/profiles/RB1xx.mk
diff --git a/target/linux/adm5120eb-2.6/files b/target/linux/adm5120eb-2.6/files
deleted file mode 120000
index 300f20ce640f5c14deecb9dde1a1cba19fe69b3d..0000000000000000000000000000000000000000
--- a/target/linux/adm5120eb-2.6/files
+++ /dev/null
@@ -1 +0,0 @@
-../adm5120-2.6/files
\ No newline at end of file
diff --git a/target/linux/adm5120eb-2.6/patches-2.6.22 b/target/linux/adm5120eb-2.6/patches-2.6.22
deleted file mode 120000
index 377f3ad9d846445a1a9d3f423c9221b8e0626bad..0000000000000000000000000000000000000000
--- a/target/linux/adm5120eb-2.6/patches-2.6.22
+++ /dev/null
@@ -1 +0,0 @@
-../adm5120-2.6/patches-2.6.22
\ No newline at end of file
diff --git a/target/linux/adm5120eb-2.6/Makefile b/target/linux/adm5120eb/Makefile
similarity index 100%
rename from target/linux/adm5120eb-2.6/Makefile
rename to target/linux/adm5120eb/Makefile
diff --git a/target/linux/adm5120eb-2.6/config/default b/target/linux/adm5120eb/config/default
similarity index 100%
rename from target/linux/adm5120eb-2.6/config/default
rename to target/linux/adm5120eb/config/default
diff --git a/target/linux/adm5120eb/files b/target/linux/adm5120eb/files
new file mode 120000
index 0000000000000000000000000000000000000000..aadc1cd380ad1c3b66311222b6c77c3addfb2455
--- /dev/null
+++ b/target/linux/adm5120eb/files
@@ -0,0 +1 @@
+../adm5120/files
\ No newline at end of file
diff --git a/target/linux/adm5120eb-2.6/image/Makefile b/target/linux/adm5120eb/image/Makefile
similarity index 100%
rename from target/linux/adm5120eb-2.6/image/Makefile
rename to target/linux/adm5120eb/image/Makefile
diff --git a/target/linux/adm5120eb-2.6/image/lzma-loader b/target/linux/adm5120eb/image/lzma-loader
similarity index 100%
rename from target/linux/adm5120eb-2.6/image/lzma-loader
rename to target/linux/adm5120eb/image/lzma-loader
diff --git a/target/linux/adm5120eb/patches-2.6.22 b/target/linux/adm5120eb/patches-2.6.22
new file mode 120000
index 0000000000000000000000000000000000000000..09e734222bbf025e747afdb996f1d2b4de030efc
--- /dev/null
+++ b/target/linux/adm5120eb/patches-2.6.22
@@ -0,0 +1 @@
+../adm5120/patches-2.6.22
\ No newline at end of file
diff --git a/target/linux/adm5120eb-2.6/profiles/090-Zyxel.mk b/target/linux/adm5120eb/profiles/090-Zyxel.mk
similarity index 100%
rename from target/linux/adm5120eb-2.6/profiles/090-Zyxel.mk
rename to target/linux/adm5120eb/profiles/090-Zyxel.mk
diff --git a/target/linux/adm5120eb-2.6/profiles/100-Texas.mk b/target/linux/adm5120eb/profiles/100-Texas.mk
similarity index 100%
rename from target/linux/adm5120eb-2.6/profiles/100-Texas.mk
rename to target/linux/adm5120eb/profiles/100-Texas.mk
diff --git a/target/linux/adm5120eb-2.6/profiles/110-Atheros.mk b/target/linux/adm5120eb/profiles/110-Atheros.mk
similarity index 100%
rename from target/linux/adm5120eb-2.6/profiles/110-Atheros.mk
rename to target/linux/adm5120eb/profiles/110-Atheros.mk
diff --git a/target/linux/adm5120eb-2.6/profiles/110-None.mk b/target/linux/adm5120eb/profiles/110-None.mk
similarity index 100%
rename from target/linux/adm5120eb-2.6/profiles/110-None.mk
rename to target/linux/adm5120eb/profiles/110-None.mk
diff --git a/target/linux/amazon-2.6/Makefile b/target/linux/amazon/Makefile
similarity index 100%
rename from target/linux/amazon-2.6/Makefile
rename to target/linux/amazon/Makefile
diff --git a/target/linux/amazon-2.6/base-files/default/etc/config/network b/target/linux/amazon/base-files/default/etc/config/network
similarity index 100%
rename from target/linux/amazon-2.6/base-files/default/etc/config/network
rename to target/linux/amazon/base-files/default/etc/config/network
diff --git a/target/linux/amazon-2.6/config/default b/target/linux/amazon/config/default
similarity index 100%
rename from target/linux/amazon-2.6/config/default
rename to target/linux/amazon/config/default
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/Kconfig b/target/linux/amazon/files/arch/mips/amazon/Kconfig
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/Kconfig
rename to target/linux/amazon/files/arch/mips/amazon/Kconfig
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/Makefile b/target/linux/amazon/files/arch/mips/amazon/Makefile
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/Makefile
rename to target/linux/amazon/files/arch/mips/amazon/Makefile
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/dma-core.c b/target/linux/amazon/files/arch/mips/amazon/dma-core.c
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/dma-core.c
rename to target/linux/amazon/files/arch/mips/amazon/dma-core.c
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/dma-core.h b/target/linux/amazon/files/arch/mips/amazon/dma-core.h
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/dma-core.h
rename to target/linux/amazon/files/arch/mips/amazon/dma-core.h
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/interrupt.c b/target/linux/amazon/files/arch/mips/amazon/interrupt.c
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/interrupt.c
rename to target/linux/amazon/files/arch/mips/amazon/interrupt.c
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/pci.c b/target/linux/amazon/files/arch/mips/amazon/pci.c
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/pci.c
rename to target/linux/amazon/files/arch/mips/amazon/pci.c
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/prom.c b/target/linux/amazon/files/arch/mips/amazon/prom.c
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/prom.c
rename to target/linux/amazon/files/arch/mips/amazon/prom.c
diff --git a/target/linux/amazon-2.6/files/arch/mips/amazon/setup.c b/target/linux/amazon/files/arch/mips/amazon/setup.c
similarity index 100%
rename from target/linux/amazon-2.6/files/arch/mips/amazon/setup.c
rename to target/linux/amazon/files/arch/mips/amazon/setup.c
diff --git a/target/linux/amazon-2.6/files/drivers/atm/amazon_tpe.c b/target/linux/amazon/files/drivers/atm/amazon_tpe.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/atm/amazon_tpe.c
rename to target/linux/amazon/files/drivers/atm/amazon_tpe.c
diff --git a/target/linux/amazon-2.6/files/drivers/char/admmod.c b/target/linux/amazon/files/drivers/char/admmod.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/char/admmod.c
rename to target/linux/amazon/files/drivers/char/admmod.c
diff --git a/target/linux/amazon-2.6/files/drivers/char/amazon_mei.c b/target/linux/amazon/files/drivers/char/amazon_mei.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/char/amazon_mei.c
rename to target/linux/amazon/files/drivers/char/amazon_mei.c
diff --git a/target/linux/amazon-2.6/files/drivers/char/ifx_ssc.c b/target/linux/amazon/files/drivers/char/ifx_ssc.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/char/ifx_ssc.c
rename to target/linux/amazon/files/drivers/char/ifx_ssc.c
diff --git a/target/linux/amazon-2.6/files/drivers/char/watchdog/amazon_wdt.c b/target/linux/amazon/files/drivers/char/watchdog/amazon_wdt.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/char/watchdog/amazon_wdt.c
rename to target/linux/amazon/files/drivers/char/watchdog/amazon_wdt.c
diff --git a/target/linux/amazon-2.6/files/drivers/mtd/maps/amazon.c b/target/linux/amazon/files/drivers/mtd/maps/amazon.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/mtd/maps/amazon.c
rename to target/linux/amazon/files/drivers/mtd/maps/amazon.c
diff --git a/target/linux/amazon-2.6/files/drivers/net/amazon_sw.c b/target/linux/amazon/files/drivers/net/amazon_sw.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/net/amazon_sw.c
rename to target/linux/amazon/files/drivers/net/amazon_sw.c
diff --git a/target/linux/amazon-2.6/files/drivers/serial/amazon_asc.c b/target/linux/amazon/files/drivers/serial/amazon_asc.c
similarity index 100%
rename from target/linux/amazon-2.6/files/drivers/serial/amazon_asc.c
rename to target/linux/amazon/files/drivers/serial/amazon_asc.c
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/adm6996.h b/target/linux/amazon/files/include/asm-mips/amazon/adm6996.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/adm6996.h
rename to target/linux/amazon/files/include/asm-mips/amazon/adm6996.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_dma.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_dma.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_dma.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_dma.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_mei.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei_app.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei_app.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei_app_ioctl.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app_ioctl.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei_app_ioctl.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_app_ioctl.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei_ioctl.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_ioctl.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_mei_ioctl.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_mei_ioctl.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_sw.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_sw.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_sw.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_sw.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_tpe.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_tpe.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_tpe.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_tpe.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_wdt.h b/target/linux/amazon/files/include/asm-mips/amazon/amazon_wdt.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/amazon_wdt.h
rename to target/linux/amazon/files/include/asm-mips/amazon/amazon_wdt.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/atm_defines.h b/target/linux/amazon/files/include/asm-mips/amazon/atm_defines.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/atm_defines.h
rename to target/linux/amazon/files/include/asm-mips/amazon/atm_defines.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/atm_mib.h b/target/linux/amazon/files/include/asm-mips/amazon/atm_mib.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/atm_mib.h
rename to target/linux/amazon/files/include/asm-mips/amazon/atm_mib.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/ifx_peripheral_definitions.h b/target/linux/amazon/files/include/asm-mips/amazon/ifx_peripheral_definitions.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/ifx_peripheral_definitions.h
rename to target/linux/amazon/files/include/asm-mips/amazon/ifx_peripheral_definitions.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/ifx_ssc.h b/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/ifx_ssc.h
rename to target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/ifx_ssc_defines.h b/target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc_defines.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/ifx_ssc_defines.h
rename to target/linux/amazon/files/include/asm-mips/amazon/ifx_ssc_defines.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/irq.h b/target/linux/amazon/files/include/asm-mips/amazon/irq.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/irq.h
rename to target/linux/amazon/files/include/asm-mips/amazon/irq.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/model.h b/target/linux/amazon/files/include/asm-mips/amazon/model.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/model.h
rename to target/linux/amazon/files/include/asm-mips/amazon/model.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/port.h b/target/linux/amazon/files/include/asm-mips/amazon/port.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/port.h
rename to target/linux/amazon/files/include/asm-mips/amazon/port.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/amazon/serial.h b/target/linux/amazon/files/include/asm-mips/amazon/serial.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/amazon/serial.h
rename to target/linux/amazon/files/include/asm-mips/amazon/serial.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/mach-amazon/irq.h b/target/linux/amazon/files/include/asm-mips/mach-amazon/irq.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/mach-amazon/irq.h
rename to target/linux/amazon/files/include/asm-mips/mach-amazon/irq.h
diff --git a/target/linux/amazon-2.6/files/include/asm-mips/mach-amazon/mangle-port.h b/target/linux/amazon/files/include/asm-mips/mach-amazon/mangle-port.h
similarity index 100%
rename from target/linux/amazon-2.6/files/include/asm-mips/mach-amazon/mangle-port.h
rename to target/linux/amazon/files/include/asm-mips/mach-amazon/mangle-port.h
diff --git a/target/linux/amazon-2.6/image/Makefile b/target/linux/amazon/image/Makefile
similarity index 100%
rename from target/linux/amazon-2.6/image/Makefile
rename to target/linux/amazon/image/Makefile
diff --git a/target/linux/amazon-2.6/patches/017-wdt-driver.patch b/target/linux/amazon/patches/017-wdt-driver.patch
similarity index 100%
rename from target/linux/amazon-2.6/patches/017-wdt-driver.patch
rename to target/linux/amazon/patches/017-wdt-driver.patch
diff --git a/target/linux/amazon-2.6/patches/100-board.patch b/target/linux/amazon/patches/100-board.patch
similarity index 100%
rename from target/linux/amazon-2.6/patches/100-board.patch
rename to target/linux/amazon/patches/100-board.patch
diff --git a/target/linux/amazon-2.6/patches/110-char_drivers.patch b/target/linux/amazon/patches/110-char_drivers.patch
similarity index 100%
rename from target/linux/amazon-2.6/patches/110-char_drivers.patch
rename to target/linux/amazon/patches/110-char_drivers.patch
diff --git a/target/linux/amazon-2.6/patches/130-mtd_drivers.patch b/target/linux/amazon/patches/130-mtd_drivers.patch
similarity index 100%
rename from target/linux/amazon-2.6/patches/130-mtd_drivers.patch
rename to target/linux/amazon/patches/130-mtd_drivers.patch
diff --git a/target/linux/amazon-2.6/patches/140-net_drivers.patch b/target/linux/amazon/patches/140-net_drivers.patch
similarity index 100%
rename from target/linux/amazon-2.6/patches/140-net_drivers.patch
rename to target/linux/amazon/patches/140-net_drivers.patch
diff --git a/target/linux/amazon-2.6/patches/150-serial_driver.patch b/target/linux/amazon/patches/150-serial_driver.patch
similarity index 100%
rename from target/linux/amazon-2.6/patches/150-serial_driver.patch
rename to target/linux/amazon/patches/150-serial_driver.patch
diff --git a/target/linux/amazon-2.6/patches/160-cfi-swap.patch b/target/linux/amazon/patches/160-cfi-swap.patch
similarity index 100%
rename from target/linux/amazon-2.6/patches/160-cfi-swap.patch
rename to target/linux/amazon/patches/160-cfi-swap.patch
diff --git a/target/linux/amcc-2.6/Makefile b/target/linux/amcc/Makefile
similarity index 100%
rename from target/linux/amcc-2.6/Makefile
rename to target/linux/amcc/Makefile
diff --git a/target/linux/amcc-2.6/base-files/default/etc/inittab b/target/linux/amcc/base-files/default/etc/inittab
similarity index 100%
rename from target/linux/amcc-2.6/base-files/default/etc/inittab
rename to target/linux/amcc/base-files/default/etc/inittab
diff --git a/target/linux/amcc-2.6/config/default b/target/linux/amcc/config/default
similarity index 100%
rename from target/linux/amcc-2.6/config/default
rename to target/linux/amcc/config/default
diff --git a/target/linux/amcc-2.6/image/Makefile b/target/linux/amcc/image/Makefile
similarity index 100%
rename from target/linux/amcc-2.6/image/Makefile
rename to target/linux/amcc/image/Makefile
diff --git a/target/linux/amcc-2.6/patches/100-taishan_emac.patch b/target/linux/amcc/patches/100-taishan_emac.patch
similarity index 100%
rename from target/linux/amcc-2.6/patches/100-taishan_emac.patch
rename to target/linux/amcc/patches/100-taishan_emac.patch
diff --git a/target/linux/amcc-2.6/patches/110-openwrt_mtd_mapping.patch b/target/linux/amcc/patches/110-openwrt_mtd_mapping.patch
similarity index 100%
rename from target/linux/amcc-2.6/patches/110-openwrt_mtd_mapping.patch
rename to target/linux/amcc/patches/110-openwrt_mtd_mapping.patch
diff --git a/target/linux/amcc-2.6/patches/120-uncompressed_uImage.patch b/target/linux/amcc/patches/120-uncompressed_uImage.patch
similarity index 100%
rename from target/linux/amcc-2.6/patches/120-uncompressed_uImage.patch
rename to target/linux/amcc/patches/120-uncompressed_uImage.patch
diff --git a/target/linux/ar7-2.6/Makefile b/target/linux/ar7/Makefile
similarity index 100%
rename from target/linux/ar7-2.6/Makefile
rename to target/linux/ar7/Makefile
diff --git a/target/linux/ar7-2.6/base-files.mk b/target/linux/ar7/base-files.mk
similarity index 100%
rename from target/linux/ar7-2.6/base-files.mk
rename to target/linux/ar7/base-files.mk
diff --git a/target/linux/ar7-2.6/base-files/default/etc/config/network b/target/linux/ar7/base-files/default/etc/config/network
similarity index 100%
rename from target/linux/ar7-2.6/base-files/default/etc/config/network
rename to target/linux/ar7/base-files/default/etc/config/network
diff --git a/target/linux/ar7-2.6/base-files/default/etc/diag.sh b/target/linux/ar7/base-files/default/etc/diag.sh
similarity index 100%
rename from target/linux/ar7-2.6/base-files/default/etc/diag.sh
rename to target/linux/ar7/base-files/default/etc/diag.sh
diff --git a/target/linux/ar7-2.6/base-files/default/etc/init.d/adam2 b/target/linux/ar7/base-files/default/etc/init.d/adam2
similarity index 100%
rename from target/linux/ar7-2.6/base-files/default/etc/init.d/adam2
rename to target/linux/ar7/base-files/default/etc/init.d/adam2
diff --git a/target/linux/ar7-2.6/config/default b/target/linux/ar7/config/default
similarity index 100%
rename from target/linux/ar7-2.6/config/default
rename to target/linux/ar7/config/default
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/Makefile b/target/linux/ar7/files/arch/mips/ar7/Makefile
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/Makefile
rename to target/linux/ar7/files/arch/mips/ar7/Makefile
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/clock.c b/target/linux/ar7/files/arch/mips/ar7/clock.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/clock.c
rename to target/linux/ar7/files/arch/mips/ar7/clock.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/gpio.c b/target/linux/ar7/files/arch/mips/ar7/gpio.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/gpio.c
rename to target/linux/ar7/files/arch/mips/ar7/gpio.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/irq.c b/target/linux/ar7/files/arch/mips/ar7/irq.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/irq.c
rename to target/linux/ar7/files/arch/mips/ar7/irq.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/memory.c b/target/linux/ar7/files/arch/mips/ar7/memory.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/memory.c
rename to target/linux/ar7/files/arch/mips/ar7/memory.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/platform.c b/target/linux/ar7/files/arch/mips/ar7/platform.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/platform.c
rename to target/linux/ar7/files/arch/mips/ar7/platform.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/prom.c b/target/linux/ar7/files/arch/mips/ar7/prom.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/prom.c
rename to target/linux/ar7/files/arch/mips/ar7/prom.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/setup.c b/target/linux/ar7/files/arch/mips/ar7/setup.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/setup.c
rename to target/linux/ar7/files/arch/mips/ar7/setup.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/time.c b/target/linux/ar7/files/arch/mips/ar7/time.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/time.c
rename to target/linux/ar7/files/arch/mips/ar7/time.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/vlynq-pci.c b/target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/vlynq-pci.c
rename to target/linux/ar7/files/arch/mips/ar7/vlynq-pci.c
diff --git a/target/linux/ar7-2.6/files/arch/mips/ar7/vlynq.c b/target/linux/ar7/files/arch/mips/ar7/vlynq.c
similarity index 100%
rename from target/linux/ar7-2.6/files/arch/mips/ar7/vlynq.c
rename to target/linux/ar7/files/arch/mips/ar7/vlynq.c
diff --git a/target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c b/target/linux/ar7/files/drivers/char/ar7_gpio.c
similarity index 100%
rename from target/linux/ar7-2.6/files/drivers/char/ar7_gpio.c
rename to target/linux/ar7/files/drivers/char/ar7_gpio.c
diff --git a/target/linux/ar7-2.6/files/drivers/char/watchdog/ar7_wdt.c b/target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
similarity index 100%
rename from target/linux/ar7-2.6/files/drivers/char/watchdog/ar7_wdt.c
rename to target/linux/ar7/files/drivers/char/watchdog/ar7_wdt.c
diff --git a/target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c b/target/linux/ar7/files/drivers/leds/leds-ar7.c
similarity index 100%
rename from target/linux/ar7-2.6/files/drivers/leds/leds-ar7.c
rename to target/linux/ar7/files/drivers/leds/leds-ar7.c
diff --git a/target/linux/ar7-2.6/files/drivers/mtd/ar7part.c b/target/linux/ar7/files/drivers/mtd/ar7part.c
similarity index 100%
rename from target/linux/ar7-2.6/files/drivers/mtd/ar7part.c
rename to target/linux/ar7/files/drivers/mtd/ar7part.c
diff --git a/target/linux/ar7-2.6/files/drivers/net/cpmac.c b/target/linux/ar7/files/drivers/net/cpmac.c
similarity index 100%
rename from target/linux/ar7-2.6/files/drivers/net/cpmac.c
rename to target/linux/ar7/files/drivers/net/cpmac.c
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h b/target/linux/ar7/files/include/asm-mips/ar7/ar7.h
similarity index 100%
rename from target/linux/ar7-2.6/files/include/asm-mips/ar7/ar7.h
rename to target/linux/ar7/files/include/asm-mips/ar7/ar7.h
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/gpio.h b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
similarity index 100%
rename from target/linux/ar7-2.6/files/include/asm-mips/ar7/gpio.h
rename to target/linux/ar7/files/include/asm-mips/ar7/gpio.h
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/mmzone.h b/target/linux/ar7/files/include/asm-mips/ar7/mmzone.h
similarity index 100%
rename from target/linux/ar7-2.6/files/include/asm-mips/ar7/mmzone.h
rename to target/linux/ar7/files/include/asm-mips/ar7/mmzone.h
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/prom.h b/target/linux/ar7/files/include/asm-mips/ar7/prom.h
similarity index 100%
rename from target/linux/ar7-2.6/files/include/asm-mips/ar7/prom.h
rename to target/linux/ar7/files/include/asm-mips/ar7/prom.h
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h b/target/linux/ar7/files/include/asm-mips/ar7/spaces.h
similarity index 100%
rename from target/linux/ar7-2.6/files/include/asm-mips/ar7/spaces.h
rename to target/linux/ar7/files/include/asm-mips/ar7/spaces.h
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/ar7/vlynq.h b/target/linux/ar7/files/include/asm-mips/ar7/vlynq.h
similarity index 100%
rename from target/linux/ar7-2.6/files/include/asm-mips/ar7/vlynq.h
rename to target/linux/ar7/files/include/asm-mips/ar7/vlynq.h
diff --git a/target/linux/ar7-2.6/files/include/asm-mips/gpio.h b/target/linux/ar7/files/include/asm-mips/gpio.h
similarity index 100%
rename from target/linux/ar7-2.6/files/include/asm-mips/gpio.h
rename to target/linux/ar7/files/include/asm-mips/gpio.h
diff --git a/target/linux/ar7-2.6/image/Makefile b/target/linux/ar7/image/Makefile
similarity index 100%
rename from target/linux/ar7-2.6/image/Makefile
rename to target/linux/ar7/image/Makefile
diff --git a/target/linux/ar7-2.6/patches-2.6.22/100-board_support.patch b/target/linux/ar7/patches-2.6.22/100-board_support.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/100-board_support.patch
rename to target/linux/ar7/patches-2.6.22/100-board_support.patch
diff --git a/target/linux/ar7-2.6/patches-2.6.22/110-flash.patch b/target/linux/ar7/patches-2.6.22/110-flash.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/110-flash.patch
rename to target/linux/ar7/patches-2.6.22/110-flash.patch
diff --git a/target/linux/ar7-2.6/patches-2.6.22/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.22/120-gpio_chrdev.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/120-gpio_chrdev.patch
rename to target/linux/ar7/patches-2.6.22/120-gpio_chrdev.patch
diff --git a/target/linux/ar7-2.6/patches-2.6.22/130-leds.patch b/target/linux/ar7/patches-2.6.22/130-leds.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/130-leds.patch
rename to target/linux/ar7/patches-2.6.22/130-leds.patch
diff --git a/target/linux/ar7-2.6/patches-2.6.22/140-watchdog.patch b/target/linux/ar7/patches-2.6.22/140-watchdog.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/140-watchdog.patch
rename to target/linux/ar7/patches-2.6.22/140-watchdog.patch
diff --git a/target/linux/ar7-2.6/patches-2.6.22/200-ethernet_driver.patch b/target/linux/ar7/patches-2.6.22/200-ethernet_driver.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/200-ethernet_driver.patch
rename to target/linux/ar7/patches-2.6.22/200-ethernet_driver.patch
diff --git a/target/linux/ar7-2.6/patches-2.6.22/210-phy_fixed.patch b/target/linux/ar7/patches-2.6.22/210-phy_fixed.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/210-phy_fixed.patch
rename to target/linux/ar7/patches-2.6.22/210-phy_fixed.patch
diff --git a/target/linux/ar7-2.6/patches-2.6.22/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.22/500-serial_kludge.patch
similarity index 100%
rename from target/linux/ar7-2.6/patches-2.6.22/500-serial_kludge.patch
rename to target/linux/ar7/patches-2.6.22/500-serial_kludge.patch
diff --git a/target/linux/ar7-2.6/profiles/100-Texas.mk b/target/linux/ar7/profiles/100-Texas.mk
similarity index 100%
rename from target/linux/ar7-2.6/profiles/100-Texas.mk
rename to target/linux/ar7/profiles/100-Texas.mk
diff --git a/target/linux/ar7-2.6/profiles/110-None.mk b/target/linux/ar7/profiles/110-None.mk
similarity index 100%
rename from target/linux/ar7-2.6/profiles/110-None.mk
rename to target/linux/ar7/profiles/110-None.mk
diff --git a/target/linux/ar7-2.6/src/adam2patcher.c b/target/linux/ar7/src/adam2patcher.c
similarity index 100%
rename from target/linux/ar7-2.6/src/adam2patcher.c
rename to target/linux/ar7/src/adam2patcher.c
diff --git a/target/linux/at91-2.6/Makefile b/target/linux/at91/Makefile
similarity index 100%
rename from target/linux/at91-2.6/Makefile
rename to target/linux/at91/Makefile
diff --git a/target/linux/at91-2.6/base-files/default/etc/inittab b/target/linux/at91/base-files/default/etc/inittab
similarity index 100%
rename from target/linux/at91-2.6/base-files/default/etc/inittab
rename to target/linux/at91/base-files/default/etc/inittab
diff --git a/target/linux/at91-2.6/base-files/default/etc/ipkg.conf b/target/linux/at91/base-files/default/etc/ipkg.conf
similarity index 100%
rename from target/linux/at91-2.6/base-files/default/etc/ipkg.conf
rename to target/linux/at91/base-files/default/etc/ipkg.conf
diff --git a/target/linux/at91-2.6/config/default b/target/linux/at91/config/default
similarity index 100%
rename from target/linux/at91-2.6/config/default
rename to target/linux/at91/config/default
diff --git a/target/linux/at91-2.6/files/drivers/mtd/at91part.c b/target/linux/at91/files/drivers/mtd/at91part.c
similarity index 100%
rename from target/linux/at91-2.6/files/drivers/mtd/at91part.c
rename to target/linux/at91/files/drivers/mtd/at91part.c
diff --git a/target/linux/at91-2.6/image/Config.in b/target/linux/at91/image/Config.in
similarity index 100%
rename from target/linux/at91-2.6/image/Config.in
rename to target/linux/at91/image/Config.in
diff --git a/target/linux/at91-2.6/image/Makefile b/target/linux/at91/image/Makefile
similarity index 100%
rename from target/linux/at91-2.6/image/Makefile
rename to target/linux/at91/image/Makefile
diff --git a/target/linux/at91-2.6/image/dfboot/Makefile b/target/linux/at91/image/dfboot/Makefile
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/Makefile
rename to target/linux/at91/image/dfboot/Makefile
diff --git a/target/linux/at91-2.6/image/dfboot/src/Makefile b/target/linux/at91/image/dfboot/src/Makefile
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/Makefile
rename to target/linux/at91/image/dfboot/src/Makefile
diff --git a/target/linux/at91-2.6/image/dfboot/src/_udivsi3.S b/target/linux/at91/image/dfboot/src/_udivsi3.S
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/_udivsi3.S
rename to target/linux/at91/image/dfboot/src/_udivsi3.S
diff --git a/target/linux/at91-2.6/image/dfboot/src/_umodsi3.S b/target/linux/at91/image/dfboot/src/_umodsi3.S
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/_umodsi3.S
rename to target/linux/at91/image/dfboot/src/_umodsi3.S
diff --git a/target/linux/at91-2.6/image/dfboot/src/asm_isr.S b/target/linux/at91/image/dfboot/src/asm_isr.S
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/asm_isr.S
rename to target/linux/at91/image/dfboot/src/asm_isr.S
diff --git a/target/linux/at91-2.6/image/dfboot/src/asm_mci_isr.S b/target/linux/at91/image/dfboot/src/asm_mci_isr.S
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/asm_mci_isr.S
rename to target/linux/at91/image/dfboot/src/asm_mci_isr.S
diff --git a/target/linux/at91-2.6/image/dfboot/src/at45.c b/target/linux/at91/image/dfboot/src/at45.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/at45.c
rename to target/linux/at91/image/dfboot/src/at45.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/com.c b/target/linux/at91/image/dfboot/src/com.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/com.c
rename to target/linux/at91/image/dfboot/src/com.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/com.h b/target/linux/at91/image/dfboot/src/com.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/com.h
rename to target/linux/at91/image/dfboot/src/com.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/config.h b/target/linux/at91/image/dfboot/src/config.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/config.h
rename to target/linux/at91/image/dfboot/src/config.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/cstartup_ram.S b/target/linux/at91/image/dfboot/src/cstartup_ram.S
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/cstartup_ram.S
rename to target/linux/at91/image/dfboot/src/cstartup_ram.S
diff --git a/target/linux/at91-2.6/image/dfboot/src/dataflash.c b/target/linux/at91/image/dfboot/src/dataflash.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/dataflash.c
rename to target/linux/at91/image/dfboot/src/dataflash.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/dataflash.h b/target/linux/at91/image/dfboot/src/dataflash.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/dataflash.h
rename to target/linux/at91/image/dfboot/src/dataflash.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/div0.c b/target/linux/at91/image/dfboot/src/div0.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/div0.c
rename to target/linux/at91/image/dfboot/src/div0.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/elf32-littlearm.lds b/target/linux/at91/image/dfboot/src/elf32-littlearm.lds
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/elf32-littlearm.lds
rename to target/linux/at91/image/dfboot/src/elf32-littlearm.lds
diff --git a/target/linux/at91-2.6/image/dfboot/src/embedded_services.h b/target/linux/at91/image/dfboot/src/embedded_services.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/embedded_services.h
rename to target/linux/at91/image/dfboot/src/embedded_services.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/include/AT91C_MCI_Device.h b/target/linux/at91/image/dfboot/src/include/AT91C_MCI_Device.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/include/AT91C_MCI_Device.h
rename to target/linux/at91/image/dfboot/src/include/AT91C_MCI_Device.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/include/AT91RM9200.h b/target/linux/at91/image/dfboot/src/include/AT91RM9200.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/include/AT91RM9200.h
rename to target/linux/at91/image/dfboot/src/include/AT91RM9200.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/include/AT91RM9200.inc b/target/linux/at91/image/dfboot/src/include/AT91RM9200.inc
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/include/AT91RM9200.inc
rename to target/linux/at91/image/dfboot/src/include/AT91RM9200.inc
diff --git a/target/linux/at91-2.6/image/dfboot/src/include/AT91RM9200_inc.h b/target/linux/at91/image/dfboot/src/include/AT91RM9200_inc.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/include/AT91RM9200_inc.h
rename to target/linux/at91/image/dfboot/src/include/AT91RM9200_inc.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/include/led.h b/target/linux/at91/image/dfboot/src/include/led.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/include/led.h
rename to target/linux/at91/image/dfboot/src/include/led.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/include/lib_AT91RM9200.h b/target/linux/at91/image/dfboot/src/include/lib_AT91RM9200.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/include/lib_AT91RM9200.h
rename to target/linux/at91/image/dfboot/src/include/lib_AT91RM9200.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/init.c b/target/linux/at91/image/dfboot/src/init.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/init.c
rename to target/linux/at91/image/dfboot/src/init.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/jump.S b/target/linux/at91/image/dfboot/src/jump.S
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/jump.S
rename to target/linux/at91/image/dfboot/src/jump.S
diff --git a/target/linux/at91-2.6/image/dfboot/src/led.c b/target/linux/at91/image/dfboot/src/led.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/led.c
rename to target/linux/at91/image/dfboot/src/led.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/main.c b/target/linux/at91/image/dfboot/src/main.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/main.c
rename to target/linux/at91/image/dfboot/src/main.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/main.h b/target/linux/at91/image/dfboot/src/main.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/main.h
rename to target/linux/at91/image/dfboot/src/main.h
diff --git a/target/linux/at91-2.6/image/dfboot/src/mci_device.c b/target/linux/at91/image/dfboot/src/mci_device.c
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/mci_device.c
rename to target/linux/at91/image/dfboot/src/mci_device.c
diff --git a/target/linux/at91-2.6/image/dfboot/src/stdio.h b/target/linux/at91/image/dfboot/src/stdio.h
similarity index 100%
rename from target/linux/at91-2.6/image/dfboot/src/stdio.h
rename to target/linux/at91/image/dfboot/src/stdio.h
diff --git a/target/linux/at91-2.6/image/u-boot/Makefile b/target/linux/at91/image/u-boot/Makefile
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/Makefile
rename to target/linux/at91/image/u-boot/Makefile
diff --git a/target/linux/at91-2.6/image/u-boot/patches/001-lowlevel-config.patch b/target/linux/at91/image/u-boot/patches/001-lowlevel-config.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/001-lowlevel-config.patch
rename to target/linux/at91/image/u-boot/patches/001-lowlevel-config.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/002-dataflash_machine.patch b/target/linux/at91/image/u-boot/patches/002-dataflash_machine.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/002-dataflash_machine.patch
rename to target/linux/at91/image/u-boot/patches/002-dataflash_machine.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/003-mac_init.patch b/target/linux/at91/image/u-boot/patches/003-mac_init.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/003-mac_init.patch
rename to target/linux/at91/image/u-boot/patches/003-mac_init.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/004-mac_config.patch b/target/linux/at91/image/u-boot/patches/004-mac_config.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/004-mac_config.patch
rename to target/linux/at91/image/u-boot/patches/004-mac_config.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/005-remove_float.patch b/target/linux/at91/image/u-boot/patches/005-remove_float.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/005-remove_float.patch
rename to target/linux/at91/image/u-boot/patches/005-remove_float.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/006-generate_params.patch b/target/linux/at91/image/u-boot/patches/006-generate_params.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/006-generate_params.patch
rename to target/linux/at91/image/u-boot/patches/006-generate_params.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/007-ubparams_bugfix.patch b/target/linux/at91/image/u-boot/patches/007-ubparams_bugfix.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/007-ubparams_bugfix.patch
rename to target/linux/at91/image/u-boot/patches/007-ubparams_bugfix.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/008-ubparams_bugfix.patch b/target/linux/at91/image/u-boot/patches/008-ubparams_bugfix.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/008-ubparams_bugfix.patch
rename to target/linux/at91/image/u-boot/patches/008-ubparams_bugfix.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/009-mac_init_bugfix.patch b/target/linux/at91/image/u-boot/patches/009-mac_init_bugfix.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/009-mac_init_bugfix.patch
rename to target/linux/at91/image/u-boot/patches/009-mac_init_bugfix.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/010-irda-patch-remove.patch b/target/linux/at91/image/u-boot/patches/010-irda-patch-remove.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/010-irda-patch-remove.patch
rename to target/linux/at91/image/u-boot/patches/010-irda-patch-remove.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/011-ubparams_update.patch b/target/linux/at91/image/u-boot/patches/011-ubparams_update.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/011-ubparams_update.patch
rename to target/linux/at91/image/u-boot/patches/011-ubparams_update.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/012-make_3.81.patch b/target/linux/at91/image/u-boot/patches/012-make_3.81.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/012-make_3.81.patch
rename to target/linux/at91/image/u-boot/patches/012-make_3.81.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/013-params-in-config.patch b/target/linux/at91/image/u-boot/patches/013-params-in-config.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/013-params-in-config.patch
rename to target/linux/at91/image/u-boot/patches/013-params-in-config.patch
diff --git a/target/linux/at91-2.6/image/u-boot/patches/014-ubparam-kernel.patch b/target/linux/at91/image/u-boot/patches/014-ubparam-kernel.patch
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/patches/014-ubparam-kernel.patch
rename to target/linux/at91/image/u-boot/patches/014-ubparam-kernel.patch
diff --git a/target/linux/at91-2.6/image/u-boot/ubclient/Makefile b/target/linux/at91/image/u-boot/ubclient/Makefile
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/ubclient/Makefile
rename to target/linux/at91/image/u-boot/ubclient/Makefile
diff --git a/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c b/target/linux/at91/image/u-boot/ubclient/ubpar.c
similarity index 100%
rename from target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c
rename to target/linux/at91/image/u-boot/ubclient/ubpar.c
diff --git a/target/linux/at91-2.6/patches-2.6.21/000-at91patches.patch b/target/linux/at91/patches-2.6.21/000-at91patches.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/000-at91patches.patch
rename to target/linux/at91/patches-2.6.21/000-at91patches.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/001-vlink-machine.patch b/target/linux/at91/patches-2.6.21/001-vlink-machine.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/001-vlink-machine.patch
rename to target/linux/at91/patches-2.6.21/001-vlink-machine.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/002-led-driver.patch b/target/linux/at91/patches-2.6.21/002-led-driver.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/002-led-driver.patch
rename to target/linux/at91/patches-2.6.21/002-led-driver.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/003-gpio-driver.patch b/target/linux/at91/patches-2.6.21/003-gpio-driver.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/003-gpio-driver.patch
rename to target/linux/at91/patches-2.6.21/003-gpio-driver.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/006-change-gpios.patch b/target/linux/at91/patches-2.6.21/006-change-gpios.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/006-change-gpios.patch
rename to target/linux/at91/patches-2.6.21/006-change-gpios.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/007-mtd-partition.patch b/target/linux/at91/patches-2.6.21/007-mtd-partition.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/007-mtd-partition.patch
rename to target/linux/at91/patches-2.6.21/007-mtd-partition.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/008-fdl-serial.patch b/target/linux/at91/patches-2.6.21/008-fdl-serial.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/008-fdl-serial.patch
rename to target/linux/at91/patches-2.6.21/008-fdl-serial.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/009-fdl-uartinit.patch b/target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/009-fdl-uartinit.patch
rename to target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/010-dm9161a-phyfix.patch
rename to target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/011-vlink-resetfix.patch b/target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/011-vlink-resetfix.patch
rename to target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/012-at91-mmcfix.patch b/target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/012-at91-mmcfix.patch
rename to target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/013-at91-mmc1wire.patch b/target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/013-at91-mmc1wire.patch
rename to target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch
diff --git a/target/linux/at91-2.6/patches-2.6.21/014-initpartition.patch b/target/linux/at91/patches-2.6.21/014-initpartition.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.21/014-initpartition.patch
rename to target/linux/at91/patches-2.6.21/014-initpartition.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/000-at91.patch b/target/linux/at91/patches-2.6.22/000-at91.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/000-at91.patch
rename to target/linux/at91/patches-2.6.22/000-at91.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/001-vlink-machine.patch b/target/linux/at91/patches-2.6.22/001-vlink-machine.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/001-vlink-machine.patch
rename to target/linux/at91/patches-2.6.22/001-vlink-machine.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/002-led-driver.patch b/target/linux/at91/patches-2.6.22/002-led-driver.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/002-led-driver.patch
rename to target/linux/at91/patches-2.6.22/002-led-driver.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/003-gpio-driver.patch b/target/linux/at91/patches-2.6.22/003-gpio-driver.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/003-gpio-driver.patch
rename to target/linux/at91/patches-2.6.22/003-gpio-driver.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/007-mtd-partition.patch b/target/linux/at91/patches-2.6.22/007-mtd-partition.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/007-mtd-partition.patch
rename to target/linux/at91/patches-2.6.22/007-mtd-partition.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/008-fdl-serial.patch b/target/linux/at91/patches-2.6.22/008-fdl-serial.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/008-fdl-serial.patch
rename to target/linux/at91/patches-2.6.22/008-fdl-serial.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/009-fdl-uartinit.patch b/target/linux/at91/patches-2.6.22/009-fdl-uartinit.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/009-fdl-uartinit.patch
rename to target/linux/at91/patches-2.6.22/009-fdl-uartinit.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/010-dm9161a-phyfix.patch
rename to target/linux/at91/patches-2.6.22/010-dm9161a-phyfix.patch
diff --git a/target/linux/at91-2.6/patches-2.6.22/014-initpartition.patch b/target/linux/at91/patches-2.6.22/014-initpartition.patch
similarity index 100%
rename from target/linux/at91-2.6/patches-2.6.22/014-initpartition.patch
rename to target/linux/at91/patches-2.6.22/014-initpartition.patch
diff --git a/target/linux/atheros-2.6/Makefile b/target/linux/atheros/Makefile
similarity index 100%
rename from target/linux/atheros-2.6/Makefile
rename to target/linux/atheros/Makefile
diff --git a/target/linux/atheros-2.6/base-files/default/etc/preinit.arch b/target/linux/atheros/base-files/default/etc/preinit.arch
similarity index 100%
rename from target/linux/atheros-2.6/base-files/default/etc/preinit.arch
rename to target/linux/atheros/base-files/default/etc/preinit.arch
diff --git a/target/linux/atheros-2.6/config/default b/target/linux/atheros/config/default
similarity index 100%
rename from target/linux/atheros-2.6/config/default
rename to target/linux/atheros/config/default
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/Kconfig b/target/linux/atheros/files/arch/mips/atheros/Kconfig
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/Kconfig
rename to target/linux/atheros/files/arch/mips/atheros/Kconfig
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/Makefile b/target/linux/atheros/files/arch/mips/atheros/Makefile
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/Makefile
rename to target/linux/atheros/files/arch/mips/atheros/Makefile
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/Makefile b/target/linux/atheros/files/arch/mips/atheros/ar5312/Makefile
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/Makefile
rename to target/linux/atheros/files/arch/mips/atheros/ar5312/Makefile
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/ar5312.h b/target/linux/atheros/files/arch/mips/atheros/ar5312/ar5312.h
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/ar5312.h
rename to target/linux/atheros/files/arch/mips/atheros/ar5312/ar5312.h
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/board.c b/target/linux/atheros/files/arch/mips/atheros/ar5312/board.c
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/board.c
rename to target/linux/atheros/files/arch/mips/atheros/ar5312/board.c
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/irq.c b/target/linux/atheros/files/arch/mips/atheros/ar5312/irq.c
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5312/irq.c
rename to target/linux/atheros/files/arch/mips/atheros/ar5312/irq.c
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/Makefile b/target/linux/atheros/files/arch/mips/atheros/ar5315/Makefile
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/Makefile
rename to target/linux/atheros/files/arch/mips/atheros/ar5315/Makefile
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/ar5315.h b/target/linux/atheros/files/arch/mips/atheros/ar5315/ar5315.h
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/ar5315.h
rename to target/linux/atheros/files/arch/mips/atheros/ar5315/ar5315.h
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/board.c b/target/linux/atheros/files/arch/mips/atheros/ar5315/board.c
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/board.c
rename to target/linux/atheros/files/arch/mips/atheros/ar5315/board.c
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/irq.c b/target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar5315/irq.c
rename to target/linux/atheros/files/arch/mips/atheros/ar5315/irq.c
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h b/target/linux/atheros/files/arch/mips/atheros/ar531x.h
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/ar531x.h
rename to target/linux/atheros/files/arch/mips/atheros/ar531x.h
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/board.c b/target/linux/atheros/files/arch/mips/atheros/board.c
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/board.c
rename to target/linux/atheros/files/arch/mips/atheros/board.c
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/prom.c b/target/linux/atheros/files/arch/mips/atheros/prom.c
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/prom.c
rename to target/linux/atheros/files/arch/mips/atheros/prom.c
diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/reset.c b/target/linux/atheros/files/arch/mips/atheros/reset.c
similarity index 100%
rename from target/linux/atheros-2.6/files/arch/mips/atheros/reset.c
rename to target/linux/atheros/files/arch/mips/atheros/reset.c
diff --git a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c b/target/linux/atheros/files/drivers/mtd/devices/spiflash.c
similarity index 100%
rename from target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
rename to target/linux/atheros/files/drivers/mtd/devices/spiflash.c
diff --git a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.h b/target/linux/atheros/files/drivers/mtd/devices/spiflash.h
similarity index 100%
rename from target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.h
rename to target/linux/atheros/files/drivers/mtd/devices/spiflash.h
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/Makefile b/target/linux/atheros/files/drivers/net/ar2313/Makefile
similarity index 100%
rename from target/linux/atheros-2.6/files/drivers/net/ar2313/Makefile
rename to target/linux/atheros/files/drivers/net/ar2313/Makefile
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
similarity index 100%
rename from target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.c
rename to target/linux/atheros/files/drivers/net/ar2313/ar2313.c
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.h b/target/linux/atheros/files/drivers/net/ar2313/ar2313.h
similarity index 100%
rename from target/linux/atheros-2.6/files/drivers/net/ar2313/ar2313.h
rename to target/linux/atheros/files/drivers/net/ar2313/ar2313.h
diff --git a/target/linux/atheros-2.6/files/drivers/net/ar2313/dma.h b/target/linux/atheros/files/drivers/net/ar2313/dma.h
similarity index 100%
rename from target/linux/atheros-2.6/files/drivers/net/ar2313/dma.h
rename to target/linux/atheros/files/drivers/net/ar2313/dma.h
diff --git a/target/linux/atheros-2.6/files/include/asm-mips/mach-atheros/ar531x_platform.h b/target/linux/atheros/files/include/asm-mips/mach-atheros/ar531x_platform.h
similarity index 100%
rename from target/linux/atheros-2.6/files/include/asm-mips/mach-atheros/ar531x_platform.h
rename to target/linux/atheros/files/include/asm-mips/mach-atheros/ar531x_platform.h
diff --git a/target/linux/atheros-2.6/files/include/asm-mips/mach-atheros/dma-coherence.h b/target/linux/atheros/files/include/asm-mips/mach-atheros/dma-coherence.h
similarity index 100%
rename from target/linux/atheros-2.6/files/include/asm-mips/mach-atheros/dma-coherence.h
rename to target/linux/atheros/files/include/asm-mips/mach-atheros/dma-coherence.h
diff --git a/target/linux/atheros-2.6/image/Makefile b/target/linux/atheros/image/Makefile
similarity index 100%
rename from target/linux/atheros-2.6/image/Makefile
rename to target/linux/atheros/image/Makefile
diff --git a/target/linux/atheros-2.6/patches/100-board.patch b/target/linux/atheros/patches/100-board.patch
similarity index 100%
rename from target/linux/atheros-2.6/patches/100-board.patch
rename to target/linux/atheros/patches/100-board.patch
diff --git a/target/linux/atheros-2.6/patches/110-spiflash.patch b/target/linux/atheros/patches/110-spiflash.patch
similarity index 100%
rename from target/linux/atheros-2.6/patches/110-spiflash.patch
rename to target/linux/atheros/patches/110-spiflash.patch
diff --git a/target/linux/atheros-2.6/patches/130-ar2313_ethernet.patch b/target/linux/atheros/patches/130-ar2313_ethernet.patch
similarity index 100%
rename from target/linux/atheros-2.6/patches/130-ar2313_ethernet.patch
rename to target/linux/atheros/patches/130-ar2313_ethernet.patch
diff --git a/target/linux/atheros-2.6/patches/140-redboot_partition_scan.patch b/target/linux/atheros/patches/140-redboot_partition_scan.patch
similarity index 100%
rename from target/linux/atheros-2.6/patches/140-redboot_partition_scan.patch
rename to target/linux/atheros/patches/140-redboot_partition_scan.patch
diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000/Makefile
similarity index 100%
rename from target/linux/au1000-2.6/Makefile
rename to target/linux/au1000/Makefile
diff --git a/target/linux/au1000-2.6/base-files/default/etc/diag.sh b/target/linux/au1000/base-files/default/etc/diag.sh
similarity index 100%
rename from target/linux/au1000-2.6/base-files/default/etc/diag.sh
rename to target/linux/au1000/base-files/default/etc/diag.sh
diff --git a/target/linux/au1000-2.6/config/default b/target/linux/au1000/config/default
similarity index 100%
rename from target/linux/au1000-2.6/config/default
rename to target/linux/au1000/config/default
diff --git a/target/linux/au1000-2.6/files/drivers/leds/leds-mtx1.c b/target/linux/au1000/files/drivers/leds/leds-mtx1.c
similarity index 100%
rename from target/linux/au1000-2.6/files/drivers/leds/leds-mtx1.c
rename to target/linux/au1000/files/drivers/leds/leds-mtx1.c
diff --git a/target/linux/au1000-2.6/image/Makefile b/target/linux/au1000/image/Makefile
similarity index 100%
rename from target/linux/au1000-2.6/image/Makefile
rename to target/linux/au1000/image/Makefile
diff --git a/target/linux/au1000-2.6/patches/001-au1x00_gpio.patch b/target/linux/au1000/patches/001-au1x00_gpio.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/001-au1x00_gpio.patch
rename to target/linux/au1000/patches/001-au1x00_gpio.patch
diff --git a/target/linux/au1000-2.6/patches/005-au1000_eth_link_beat.patch b/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/005-au1000_eth_link_beat.patch
rename to target/linux/au1000/patches/005-au1000_eth_link_beat.patch
diff --git a/target/linux/au1000-2.6/patches/006-mtx1_system_button.patch b/target/linux/au1000/patches/006-mtx1_system_button.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/006-mtx1_system_button.patch
rename to target/linux/au1000/patches/006-mtx1_system_button.patch
diff --git a/target/linux/au1000-2.6/patches/011-mtx1_leds.patch b/target/linux/au1000/patches/011-mtx1_leds.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/011-mtx1_leds.patch
rename to target/linux/au1000/patches/011-mtx1_leds.patch
diff --git a/target/linux/au1000-2.6/patches/012-mtx1_cmdline.patch b/target/linux/au1000/patches/012-mtx1_cmdline.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/012-mtx1_cmdline.patch
rename to target/linux/au1000/patches/012-mtx1_cmdline.patch
diff --git a/target/linux/au1000-2.6/patches/013-openwrt_rootfs.patch b/target/linux/au1000/patches/013-openwrt_rootfs.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/013-openwrt_rootfs.patch
rename to target/linux/au1000/patches/013-openwrt_rootfs.patch
diff --git a/target/linux/au1000-2.6/patches/014-au1000_eth_ioctl.patch b/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/014-au1000_eth_ioctl.patch
rename to target/linux/au1000/patches/014-au1000_eth_ioctl.patch
diff --git a/target/linux/au1000-2.6/patches/015-pci-resource.patch b/target/linux/au1000/patches/015-pci-resource.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/015-pci-resource.patch
rename to target/linux/au1000/patches/015-pci-resource.patch
diff --git a/target/linux/au1000-2.6/patches/016-pci-io_map.patch b/target/linux/au1000/patches/016-pci-io_map.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/016-pci-io_map.patch
rename to target/linux/au1000/patches/016-pci-io_map.patch
diff --git a/target/linux/au1000-2.6/patches/017-usb-power.patch b/target/linux/au1000/patches/017-usb-power.patch
similarity index 100%
rename from target/linux/au1000-2.6/patches/017-usb-power.patch
rename to target/linux/au1000/patches/017-usb-power.patch
diff --git a/target/linux/au1000-2.6/profiles/Atheros.mk b/target/linux/au1000/profiles/Atheros.mk
similarity index 100%
rename from target/linux/au1000-2.6/profiles/Atheros.mk
rename to target/linux/au1000/profiles/Atheros.mk
diff --git a/target/linux/au1000-2.6/profiles/Broadcom.mk b/target/linux/au1000/profiles/Broadcom.mk
similarity index 100%
rename from target/linux/au1000-2.6/profiles/Broadcom.mk
rename to target/linux/au1000/profiles/Broadcom.mk
diff --git a/target/linux/au1000-2.6/profiles/Intel.mk b/target/linux/au1000/profiles/Intel.mk
similarity index 100%
rename from target/linux/au1000-2.6/profiles/Intel.mk
rename to target/linux/au1000/profiles/Intel.mk
diff --git a/target/linux/avr32-2.6/Makefile b/target/linux/avr32/Makefile
similarity index 100%
rename from target/linux/avr32-2.6/Makefile
rename to target/linux/avr32/Makefile
diff --git a/target/linux/avr32-2.6/config/default b/target/linux/avr32/config/default
similarity index 100%
rename from target/linux/avr32-2.6/config/default
rename to target/linux/avr32/config/default
diff --git a/target/linux/avr32-2.6/image/Makefile b/target/linux/avr32/image/Makefile
similarity index 100%
rename from target/linux/avr32-2.6/image/Makefile
rename to target/linux/avr32/image/Makefile
diff --git a/target/linux/avr32-2.6/patches/100-git_sync.patch b/target/linux/avr32/patches/100-git_sync.patch
similarity index 100%
rename from target/linux/avr32-2.6/patches/100-git_sync.patch
rename to target/linux/avr32/patches/100-git_sync.patch
diff --git a/target/linux/avr32-2.6/patches/110-openwrt_flashmap.patch b/target/linux/avr32/patches/110-openwrt_flashmap.patch
similarity index 100%
rename from target/linux/avr32-2.6/patches/110-openwrt_flashmap.patch
rename to target/linux/avr32/patches/110-openwrt_flashmap.patch
diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile
index 3158d497afc4a0e6ad000f4d17bc49108c2199df..ed7336daeaca26ac004236152d909d294c3c68ea 100644
--- a/target/linux/brcm-2.4/Makefile
+++ b/target/linux/brcm-2.4/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 ARCH:=mipsel
-BOARD:=brcm
+BOARD:=brcm-2.4
 BOARDNAME:=Broadcom BCM947xx/953xx
 FEATURES:=squashfs
 
diff --git a/target/linux/brcm47xx-2.6/Makefile b/target/linux/brcm47xx/Makefile
similarity index 100%
rename from target/linux/brcm47xx-2.6/Makefile
rename to target/linux/brcm47xx/Makefile
diff --git a/target/linux/brcm47xx-2.6/base-files b/target/linux/brcm47xx/base-files
similarity index 100%
rename from target/linux/brcm47xx-2.6/base-files
rename to target/linux/brcm47xx/base-files
diff --git a/target/linux/brcm47xx-2.6/base-files.mk b/target/linux/brcm47xx/base-files.mk
similarity index 100%
rename from target/linux/brcm47xx-2.6/base-files.mk
rename to target/linux/brcm47xx/base-files.mk
diff --git a/target/linux/brcm47xx-2.6/config/default b/target/linux/brcm47xx/config/default
similarity index 100%
rename from target/linux/brcm47xx-2.6/config/default
rename to target/linux/brcm47xx/config/default
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/Makefile b/target/linux/brcm47xx/files/arch/mips/bcm947xx/Makefile
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/Makefile
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/Makefile
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/cfe_env.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/cfe_env.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/cfe_env.c
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/cfe_env.c
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/include/nvram.h b/target/linux/brcm47xx/files/arch/mips/bcm947xx/include/nvram.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/include/nvram.h
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/include/nvram.h
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/irq.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/irq.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/irq.c
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/irq.c
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/nvram.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/nvram.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/nvram.c
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/nvram.c
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/prom.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/prom.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/prom.c
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/prom.c
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/setup.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/setup.c
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/setup.c
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/time.c b/target/linux/brcm47xx/files/arch/mips/bcm947xx/time.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/bcm947xx/time.c
rename to target/linux/brcm47xx/files/arch/mips/bcm947xx/time.c
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/cfe/Makefile b/target/linux/brcm47xx/files/arch/mips/cfe/Makefile
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/cfe/Makefile
rename to target/linux/brcm47xx/files/arch/mips/cfe/Makefile
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/cfe/cfe.c b/target/linux/brcm47xx/files/arch/mips/cfe/cfe.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/cfe/cfe.c
rename to target/linux/brcm47xx/files/arch/mips/cfe/cfe.c
diff --git a/target/linux/brcm47xx-2.6/files/arch/mips/cfe/cfe_private.h b/target/linux/brcm47xx/files/arch/mips/cfe/cfe_private.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/arch/mips/cfe/cfe_private.h
rename to target/linux/brcm47xx/files/arch/mips/cfe/cfe_private.h
diff --git a/target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c b/target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/drivers/mtd/maps/bcm47xx-flash.c
rename to target/linux/brcm47xx/files/drivers/mtd/maps/bcm47xx-flash.c
diff --git a/target/linux/brcm47xx-2.6/files/include/asm-generic/gpio.h b/target/linux/brcm47xx/files/include/asm-generic/gpio.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/asm-generic/gpio.h
rename to target/linux/brcm47xx/files/include/asm-generic/gpio.h
diff --git a/target/linux/brcm47xx-2.6/files/include/asm-mips/cfe.h b/target/linux/brcm47xx/files/include/asm-mips/cfe.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/asm-mips/cfe.h
rename to target/linux/brcm47xx/files/include/asm-mips/cfe.h
diff --git a/target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/gpio.h b/target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/gpio.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/gpio.h
rename to target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/gpio.h
diff --git a/target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/kernel-entry-init.h b/target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/kernel-entry-init.h
similarity index 100%
rename from target/linux/brcm47xx-2.6/files/include/asm-mips/mach-bcm947xx/kernel-entry-init.h
rename to target/linux/brcm47xx/files/include/asm-mips/mach-bcm947xx/kernel-entry-init.h
diff --git a/target/linux/brcm47xx-2.6/image b/target/linux/brcm47xx/image
similarity index 100%
rename from target/linux/brcm47xx-2.6/image
rename to target/linux/brcm47xx/image
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/100-board_support.patch b/target/linux/brcm47xx/patches-2.6.22/100-board_support.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/100-board_support.patch
rename to target/linux/brcm47xx/patches-2.6.22/100-board_support.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/110-flash_map.patch b/target/linux/brcm47xx/patches-2.6.22/110-flash_map.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/110-flash_map.patch
rename to target/linux/brcm47xx/patches-2.6.22/110-flash_map.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/120-b44_ssb_support.patch b/target/linux/brcm47xx/patches-2.6.22/120-b44_ssb_support.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/120-b44_ssb_support.patch
rename to target/linux/brcm47xx/patches-2.6.22/120-b44_ssb_support.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.22/130-remove_scache.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/130-remove_scache.patch
rename to target/linux/brcm47xx/patches-2.6.22/130-remove_scache.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.22/150-cpu_fixes.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/150-cpu_fixes.patch
rename to target/linux/brcm47xx/patches-2.6.22/150-cpu_fixes.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/160-kmap_coherent.patch
rename to target/linux/brcm47xx/patches-2.6.22/160-kmap_coherent.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/170-cpu_wait.patch b/target/linux/brcm47xx/patches-2.6.22/170-cpu_wait.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/170-cpu_wait.patch
rename to target/linux/brcm47xx/patches-2.6.22/170-cpu_wait.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/200-b44_ssb_fixup.patch b/target/linux/brcm47xx/patches-2.6.22/200-b44_ssb_fixup.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/200-b44_ssb_fixup.patch
rename to target/linux/brcm47xx/patches-2.6.22/200-b44_ssb_fixup.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_fixes.patch b/target/linux/brcm47xx/patches-2.6.22/210-ssb_fixes.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/210-ssb_fixes.patch
rename to target/linux/brcm47xx/patches-2.6.22/210-ssb_fixes.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/230-ssb_arch_setup.patch b/target/linux/brcm47xx/patches-2.6.22/230-ssb_arch_setup.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/230-ssb_arch_setup.patch
rename to target/linux/brcm47xx/patches-2.6.22/230-ssb_arch_setup.patch
diff --git a/target/linux/brcm47xx-2.6/patches-2.6.22/240-extif_fixes.patch b/target/linux/brcm47xx/patches-2.6.22/240-extif_fixes.patch
similarity index 100%
rename from target/linux/brcm47xx-2.6/patches-2.6.22/240-extif_fixes.patch
rename to target/linux/brcm47xx/patches-2.6.22/240-extif_fixes.patch
diff --git a/target/linux/brcm47xx-2.6/profiles/100-Atheros.mk b/target/linux/brcm47xx/profiles/100-Atheros.mk
similarity index 100%
rename from target/linux/brcm47xx-2.6/profiles/100-Atheros.mk
rename to target/linux/brcm47xx/profiles/100-Atheros.mk
diff --git a/target/linux/brcm47xx-2.6/profiles/110-None.mk b/target/linux/brcm47xx/profiles/110-None.mk
similarity index 100%
rename from target/linux/brcm47xx-2.6/profiles/110-None.mk
rename to target/linux/brcm47xx/profiles/110-None.mk
diff --git a/target/linux/brcm47xx-2.6/profiles/WGT634U.mk b/target/linux/brcm47xx/profiles/WGT634U.mk
similarity index 100%
rename from target/linux/brcm47xx-2.6/profiles/WGT634U.mk
rename to target/linux/brcm47xx/profiles/WGT634U.mk
diff --git a/target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk b/target/linux/brcm47xx/profiles/WRTSL54GS.mk
similarity index 100%
rename from target/linux/brcm47xx-2.6/profiles/WRTSL54GS.mk
rename to target/linux/brcm47xx/profiles/WRTSL54GS.mk
diff --git a/target/linux/brcm47xx-2.6/src b/target/linux/brcm47xx/src
similarity index 100%
rename from target/linux/brcm47xx-2.6/src
rename to target/linux/brcm47xx/src
diff --git a/target/linux/brcm63xx-2.6/Makefile b/target/linux/brcm63xx/Makefile
similarity index 100%
rename from target/linux/brcm63xx-2.6/Makefile
rename to target/linux/brcm63xx/Makefile
diff --git a/target/linux/brcm63xx-2.6/config/default b/target/linux/brcm63xx/config/default
similarity index 100%
rename from target/linux/brcm63xx-2.6/config/default
rename to target/linux/brcm63xx/config/default
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/Makefile b/target/linux/brcm63xx/files/arch/mips/bcm963xx/Makefile
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/Makefile
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/Makefile
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/info.c b/target/linux/brcm63xx/files/arch/mips/bcm963xx/info.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/info.c
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/info.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/int-handler.S b/target/linux/brcm63xx/files/arch/mips/bcm963xx/int-handler.S
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/int-handler.S
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/int-handler.S
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/irq.c b/target/linux/brcm63xx/files/arch/mips/bcm963xx/irq.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/irq.c
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/irq.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/prom.c b/target/linux/brcm63xx/files/arch/mips/bcm963xx/prom.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/prom.c
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/prom.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/ser_init.c b/target/linux/brcm63xx/files/arch/mips/bcm963xx/ser_init.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/ser_init.c
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/ser_init.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c b/target/linux/brcm63xx/files/arch/mips/bcm963xx/setup.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/setup.c
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/setup.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/time.c b/target/linux/brcm63xx/files/arch/mips/bcm963xx/time.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/time.c
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/time.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/wdt.c b/target/linux/brcm63xx/files/arch/mips/bcm963xx/wdt.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/bcm963xx/wdt.c
rename to target/linux/brcm63xx/files/arch/mips/bcm963xx/wdt.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/cfe/Makefile b/target/linux/brcm63xx/files/arch/mips/cfe/Makefile
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/cfe/Makefile
rename to target/linux/brcm63xx/files/arch/mips/cfe/Makefile
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/cfe/cfe.c b/target/linux/brcm63xx/files/arch/mips/cfe/cfe.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/cfe/cfe.c
rename to target/linux/brcm63xx/files/arch/mips/cfe/cfe.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/cfe/cfe_private.h b/target/linux/brcm63xx/files/arch/mips/cfe/cfe_private.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/cfe/cfe_private.h
rename to target/linux/brcm63xx/files/arch/mips/cfe/cfe_private.h
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/pci/fixup-bcm96348.c b/target/linux/brcm63xx/files/arch/mips/pci/fixup-bcm96348.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/pci/fixup-bcm96348.c
rename to target/linux/brcm63xx/files/arch/mips/pci/fixup-bcm96348.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/pci/ops-bcm96348.c b/target/linux/brcm63xx/files/arch/mips/pci/ops-bcm96348.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/pci/ops-bcm96348.c
rename to target/linux/brcm63xx/files/arch/mips/pci/ops-bcm96348.c
diff --git a/target/linux/brcm63xx-2.6/files/arch/mips/pci/pci-bcm96348.c b/target/linux/brcm63xx/files/arch/mips/pci/pci-bcm96348.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/arch/mips/pci/pci-bcm96348.c
rename to target/linux/brcm63xx/files/arch/mips/pci/pci-bcm96348.c
diff --git a/target/linux/brcm63xx-2.6/files/drivers/mtd/maps/bcm963xx-flash.c b/target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/drivers/mtd/maps/bcm963xx-flash.c
rename to target/linux/brcm63xx/files/drivers/mtd/maps/bcm963xx-flash.c
diff --git a/target/linux/brcm63xx-2.6/files/drivers/serial/bcm63xx_cons.c b/target/linux/brcm63xx/files/drivers/serial/bcm63xx_cons.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/drivers/serial/bcm63xx_cons.c
rename to target/linux/brcm63xx/files/drivers/serial/bcm63xx_cons.c
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/cfe.h b/target/linux/brcm63xx/files/include/asm-mips/cfe.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/cfe.h
rename to target/linux/brcm63xx/files/include/asm-mips/cfe.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6338_intr.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6338_intr.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6338_intr.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6338_intr.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6338_map_part.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6338_map_part.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6338_map_part.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6338_map_part.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6345_intr.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6345_intr.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6345_intr.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6345_intr.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6345_map_part.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6345_map_part.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6345_map_part.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6345_map_part.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6348_intr.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6348_intr.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6348_intr.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6348_intr.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6348_map_part.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6348_map_part.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/6348_map_part.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/6348_map_part.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcmTag.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcmTag.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcmTag.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcmTag.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcm_intr.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcm_intr.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcm_intr.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcm_intr.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcm_map_part.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcm_map_part.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcm_map_part.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcm_map_part.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcmpci.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcmpci.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcmpci.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcmpci.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcmtypes.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcmtypes.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bcmtypes.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bcmtypes.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/board.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/board.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/board.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/board.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bootloaders.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bootloaders.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/bootloaders.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/bootloaders.h
diff --git a/target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h
rename to target/linux/brcm63xx/files/include/asm-mips/mach-bcm963xx/cpu-feature-overrides.h
diff --git a/target/linux/brcm63xx-2.6/files/include/linux/atmrt2684.h b/target/linux/brcm63xx/files/include/linux/atmrt2684.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/files/include/linux/atmrt2684.h
rename to target/linux/brcm63xx/files/include/linux/atmrt2684.h
diff --git a/target/linux/brcm63xx-2.6/image/Makefile b/target/linux/brcm63xx/image/Makefile
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/Makefile
rename to target/linux/brcm63xx/image/Makefile
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/Makefile b/target/linux/brcm63xx/image/lzma-loader/Makefile
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/Makefile
rename to target/linux/brcm63xx/image/lzma-loader/Makefile
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/LzmaDecode.c b/target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/LzmaDecode.c
rename to target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.c
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/LzmaDecode.h b/target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.h
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/LzmaDecode.h
rename to target/linux/brcm63xx/image/lzma-loader/src/LzmaDecode.h
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/Makefile b/target/linux/brcm63xx/image/lzma-loader/src/Makefile
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/Makefile
rename to target/linux/brcm63xx/image/lzma-loader/src/Makefile
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/README b/target/linux/brcm63xx/image/lzma-loader/src/README
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/README
rename to target/linux/brcm63xx/image/lzma-loader/src/README
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/decompress.c b/target/linux/brcm63xx/image/lzma-loader/src/decompress.c
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/decompress.c
rename to target/linux/brcm63xx/image/lzma-loader/src/decompress.c
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/decompress.lds.in b/target/linux/brcm63xx/image/lzma-loader/src/decompress.lds.in
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/decompress.lds.in
rename to target/linux/brcm63xx/image/lzma-loader/src/decompress.lds.in
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/head.S b/target/linux/brcm63xx/image/lzma-loader/src/head.S
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/head.S
rename to target/linux/brcm63xx/image/lzma-loader/src/head.S
diff --git a/target/linux/brcm63xx-2.6/image/lzma-loader/src/loader.lds.in b/target/linux/brcm63xx/image/lzma-loader/src/loader.lds.in
similarity index 100%
rename from target/linux/brcm63xx-2.6/image/lzma-loader/src/loader.lds.in
rename to target/linux/brcm63xx/image/lzma-loader/src/loader.lds.in
diff --git a/target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch b/target/linux/brcm63xx/patches/001-bcm963xx.patch
similarity index 100%
rename from target/linux/brcm63xx-2.6/patches/001-bcm963xx.patch
rename to target/linux/brcm63xx/patches/001-bcm963xx.patch
diff --git a/target/linux/brcm63xx-2.6/patches/002-bcm963xx_serial.patch b/target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
similarity index 100%
rename from target/linux/brcm63xx-2.6/patches/002-bcm963xx_serial.patch
rename to target/linux/brcm63xx/patches/002-bcm963xx_serial.patch
diff --git a/target/linux/brcm63xx-2.6/patches/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
similarity index 100%
rename from target/linux/brcm63xx-2.6/patches/040-bcm963xx_flashmap.patch
rename to target/linux/brcm63xx/patches/040-bcm963xx_flashmap.patch
diff --git a/target/linux/brcm63xx-2.6/patches/100-atm_hacks.patch b/target/linux/brcm63xx/patches/100-atm_hacks.patch
similarity index 100%
rename from target/linux/brcm63xx-2.6/patches/100-atm_hacks.patch
rename to target/linux/brcm63xx/patches/100-atm_hacks.patch
diff --git a/target/linux/brcm63xx-2.6/patches/150-sst_flash.patch b/target/linux/brcm63xx/patches/150-sst_flash.patch
similarity index 100%
rename from target/linux/brcm63xx-2.6/patches/150-sst_flash.patch
rename to target/linux/brcm63xx/patches/150-sst_flash.patch
diff --git a/target/linux/brcm63xx-2.6/profiles/Atheros.mk b/target/linux/brcm63xx/profiles/Atheros.mk
similarity index 100%
rename from target/linux/brcm63xx-2.6/profiles/Atheros.mk
rename to target/linux/brcm63xx/profiles/Atheros.mk
diff --git a/target/linux/brcm63xx-2.6/profiles/Broadcom.mk b/target/linux/brcm63xx/profiles/Broadcom.mk
similarity index 100%
rename from target/linux/brcm63xx-2.6/profiles/Broadcom.mk
rename to target/linux/brcm63xx/profiles/Broadcom.mk
diff --git a/target/linux/brcm63xx-2.6/profiles/Ralink.mk b/target/linux/brcm63xx/profiles/Ralink.mk
similarity index 100%
rename from target/linux/brcm63xx-2.6/profiles/Ralink.mk
rename to target/linux/brcm63xx/profiles/Ralink.mk
diff --git a/target/linux/etrax-2.6/Makefile b/target/linux/etrax/Makefile
similarity index 100%
rename from target/linux/etrax-2.6/Makefile
rename to target/linux/etrax/Makefile
diff --git a/target/linux/etrax-2.6/base-files.mk b/target/linux/etrax/base-files.mk
similarity index 100%
rename from target/linux/etrax-2.6/base-files.mk
rename to target/linux/etrax/base-files.mk
diff --git a/target/linux/etrax-2.6/base-files/default/etc/config/network b/target/linux/etrax/base-files/default/etc/config/network
similarity index 100%
rename from target/linux/etrax-2.6/base-files/default/etc/config/network
rename to target/linux/etrax/base-files/default/etc/config/network
diff --git a/target/linux/etrax-2.6/base-files/default/etc/ipkg.conf b/target/linux/etrax/base-files/default/etc/ipkg.conf
similarity index 100%
rename from target/linux/etrax-2.6/base-files/default/etc/ipkg.conf
rename to target/linux/etrax/base-files/default/etc/ipkg.conf
diff --git a/target/linux/etrax-2.6/base-files/default/etc/passwd b/target/linux/etrax/base-files/default/etc/passwd
similarity index 100%
rename from target/linux/etrax-2.6/base-files/default/etc/passwd
rename to target/linux/etrax/base-files/default/etc/passwd
diff --git a/target/linux/etrax-2.6/config/default b/target/linux/etrax/config/default
similarity index 100%
rename from target/linux/etrax-2.6/config/default
rename to target/linux/etrax/config/default
diff --git a/target/linux/etrax-2.6/config/profile-vhdl_no_fb b/target/linux/etrax/config/profile-vhdl_no_fb
similarity index 100%
rename from target/linux/etrax-2.6/config/profile-vhdl_no_fb
rename to target/linux/etrax/config/profile-vhdl_no_fb
diff --git a/target/linux/etrax-2.6/files/arch/cris/arch-v10/drivers/gpio_syscalls.c b/target/linux/etrax/files/arch/cris/arch-v10/drivers/gpio_syscalls.c
similarity index 100%
rename from target/linux/etrax-2.6/files/arch/cris/arch-v10/drivers/gpio_syscalls.c
rename to target/linux/etrax/files/arch/cris/arch-v10/drivers/gpio_syscalls.c
diff --git a/target/linux/etrax-2.6/files/drivers/spi/spi_crisv32_gpio.c b/target/linux/etrax/files/drivers/spi/spi_crisv32_gpio.c
similarity index 100%
rename from target/linux/etrax-2.6/files/drivers/spi/spi_crisv32_gpio.c
rename to target/linux/etrax/files/drivers/spi/spi_crisv32_gpio.c
diff --git a/target/linux/etrax-2.6/files/drivers/spi/spi_crisv32_sser.c b/target/linux/etrax/files/drivers/spi/spi_crisv32_sser.c
similarity index 100%
rename from target/linux/etrax-2.6/files/drivers/spi/spi_crisv32_sser.c
rename to target/linux/etrax/files/drivers/spi/spi_crisv32_sser.c
diff --git a/target/linux/etrax-2.6/files/drivers/usb/host/hc-cris-dbg.h b/target/linux/etrax/files/drivers/usb/host/hc-cris-dbg.h
similarity index 100%
rename from target/linux/etrax-2.6/files/drivers/usb/host/hc-cris-dbg.h
rename to target/linux/etrax/files/drivers/usb/host/hc-cris-dbg.h
diff --git a/target/linux/etrax-2.6/files/include/linux/mtd/mtdram.h b/target/linux/etrax/files/include/linux/mtd/mtdram.h
similarity index 100%
rename from target/linux/etrax-2.6/files/include/linux/mtd/mtdram.h
rename to target/linux/etrax/files/include/linux/mtd/mtdram.h
diff --git a/target/linux/etrax-2.6/image/Config.in b/target/linux/etrax/image/Config.in
similarity index 100%
rename from target/linux/etrax-2.6/image/Config.in
rename to target/linux/etrax/image/Config.in
diff --git a/target/linux/etrax-2.6/image/Makefile b/target/linux/etrax/image/Makefile
similarity index 100%
rename from target/linux/etrax-2.6/image/Makefile
rename to target/linux/etrax/image/Makefile
diff --git a/target/linux/etrax-2.6/image/boot_linux b/target/linux/etrax/image/boot_linux
similarity index 100%
rename from target/linux/etrax-2.6/image/boot_linux
rename to target/linux/etrax/image/boot_linux
diff --git a/target/linux/etrax-2.6/image/e100boot/Makefile b/target/linux/etrax/image/e100boot/Makefile
similarity index 100%
rename from target/linux/etrax-2.6/image/e100boot/Makefile
rename to target/linux/etrax/image/e100boot/Makefile
diff --git a/target/linux/etrax-2.6/image/mkfimage/Makefile b/target/linux/etrax/image/mkfimage/Makefile
similarity index 100%
rename from target/linux/etrax-2.6/image/mkfimage/Makefile
rename to target/linux/etrax/image/mkfimage/Makefile
diff --git a/target/linux/etrax-2.6/image/mkfimage/src/Makefile b/target/linux/etrax/image/mkfimage/src/Makefile
similarity index 100%
rename from target/linux/etrax-2.6/image/mkfimage/src/Makefile
rename to target/linux/etrax/image/mkfimage/src/Makefile
diff --git a/target/linux/etrax-2.6/image/mkfimage/src/mkfimage.c b/target/linux/etrax/image/mkfimage/src/mkfimage.c
similarity index 100%
rename from target/linux/etrax-2.6/image/mkfimage/src/mkfimage.c
rename to target/linux/etrax/image/mkfimage/src/mkfimage.c
diff --git a/target/linux/etrax-2.6/patches/cris/001-include-cris.patch b/target/linux/etrax/patches/cris/001-include-cris.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/001-include-cris.patch
rename to target/linux/etrax/patches/cris/001-include-cris.patch
diff --git a/target/linux/etrax-2.6/patches/cris/002-arch-cris.patch b/target/linux/etrax/patches/cris/002-arch-cris.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/002-arch-cris.patch
rename to target/linux/etrax/patches/cris/002-arch-cris.patch
diff --git a/target/linux/etrax-2.6/patches/cris/003-drivers-cris.patch b/target/linux/etrax/patches/cris/003-drivers-cris.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/003-drivers-cris.patch
rename to target/linux/etrax/patches/cris/003-drivers-cris.patch
diff --git a/target/linux/etrax-2.6/patches/cris/004-kernel-Kconfig.sched.patch b/target/linux/etrax/patches/cris/004-kernel-Kconfig.sched.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/004-kernel-Kconfig.sched.patch
rename to target/linux/etrax/patches/cris/004-kernel-Kconfig.sched.patch
diff --git a/target/linux/etrax-2.6/patches/cris/005-loader.patch b/target/linux/etrax/patches/cris/005-loader.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/005-loader.patch
rename to target/linux/etrax/patches/cris/005-loader.patch
diff --git a/target/linux/etrax-2.6/patches/cris/006-gcc-4.patch b/target/linux/etrax/patches/cris/006-gcc-4.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/006-gcc-4.patch
rename to target/linux/etrax/patches/cris/006-gcc-4.patch
diff --git a/target/linux/etrax-2.6/patches/cris/007-nr_free_pages.patch b/target/linux/etrax/patches/cris/007-nr_free_pages.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/007-nr_free_pages.patch
rename to target/linux/etrax/patches/cris/007-nr_free_pages.patch
diff --git a/target/linux/etrax-2.6/patches/cris/008-flashmap.patch b/target/linux/etrax/patches/cris/008-flashmap.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/008-flashmap.patch
rename to target/linux/etrax/patches/cris/008-flashmap.patch
diff --git a/target/linux/etrax-2.6/patches/cris/008a-flashmap.patch b/target/linux/etrax/patches/cris/008a-flashmap.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/008a-flashmap.patch
rename to target/linux/etrax/patches/cris/008a-flashmap.patch
diff --git a/target/linux/etrax-2.6/patches/cris/009-sysfs.patch b/target/linux/etrax/patches/cris/009-sysfs.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/009-sysfs.patch
rename to target/linux/etrax/patches/cris/009-sysfs.patch
diff --git a/target/linux/etrax-2.6/patches/cris/010-multi-target-build.patch b/target/linux/etrax/patches/cris/010-multi-target-build.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/010-multi-target-build.patch
rename to target/linux/etrax/patches/cris/010-multi-target-build.patch
diff --git a/target/linux/etrax-2.6/patches/cris/011-debug-port b/target/linux/etrax/patches/cris/011-debug-port
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/011-debug-port
rename to target/linux/etrax/patches/cris/011-debug-port
diff --git a/target/linux/etrax-2.6/patches/cris/012-splash.patch b/target/linux/etrax/patches/cris/012-splash.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/012-splash.patch
rename to target/linux/etrax/patches/cris/012-splash.patch
diff --git a/target/linux/etrax-2.6/patches/cris/013-crisdriver-sysfs.patch b/target/linux/etrax/patches/cris/013-crisdriver-sysfs.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/013-crisdriver-sysfs.patch
rename to target/linux/etrax/patches/cris/013-crisdriver-sysfs.patch
diff --git a/target/linux/etrax-2.6/patches/cris/014-partition-tables.patch b/target/linux/etrax/patches/cris/014-partition-tables.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/014-partition-tables.patch
rename to target/linux/etrax/patches/cris/014-partition-tables.patch
diff --git a/target/linux/etrax-2.6/patches/cris/015-samsung-flash-chip.patch b/target/linux/etrax/patches/cris/015-samsung-flash-chip.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/015-samsung-flash-chip.patch
rename to target/linux/etrax/patches/cris/015-samsung-flash-chip.patch
diff --git a/target/linux/etrax-2.6/patches/cris/016-auto-detect-ram.patch b/target/linux/etrax/patches/cris/016-auto-detect-ram.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/016-auto-detect-ram.patch
rename to target/linux/etrax/patches/cris/016-auto-detect-ram.patch
diff --git a/target/linux/etrax-2.6/patches/cris/017-uclibc-swab.patch b/target/linux/etrax/patches/cris/017-uclibc-swab.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/017-uclibc-swab.patch
rename to target/linux/etrax/patches/cris/017-uclibc-swab.patch
diff --git a/target/linux/etrax-2.6/patches/cris/018-reboot.patch b/target/linux/etrax/patches/cris/018-reboot.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/018-reboot.patch
rename to target/linux/etrax/patches/cris/018-reboot.patch
diff --git a/target/linux/etrax-2.6/patches/cris/020-syscalls.patch b/target/linux/etrax/patches/cris/020-syscalls.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/cris/020-syscalls.patch
rename to target/linux/etrax/patches/cris/020-syscalls.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/001-squashfs.patch b/target/linux/etrax/patches/generic_2.6/001-squashfs.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/001-squashfs.patch
rename to target/linux/etrax/patches/generic_2.6/001-squashfs.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/002-lzma_decompress.patch b/target/linux/etrax/patches/generic_2.6/002-lzma_decompress.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/002-lzma_decompress.patch
rename to target/linux/etrax/patches/generic_2.6/002-lzma_decompress.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/003-squashfs_lzma.patch b/target/linux/etrax/patches/generic_2.6/003-squashfs_lzma.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/003-squashfs_lzma.patch
rename to target/linux/etrax/patches/generic_2.6/003-squashfs_lzma.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/004-extra_optimization.patch b/target/linux/etrax/patches/generic_2.6/004-extra_optimization.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/004-extra_optimization.patch
rename to target/linux/etrax/patches/generic_2.6/004-extra_optimization.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/006-gcc4_inline_fix.patch b/target/linux/etrax/patches/generic_2.6/006-gcc4_inline_fix.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/006-gcc4_inline_fix.patch
rename to target/linux/etrax/patches/generic_2.6/006-gcc4_inline_fix.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/007-samsung_flash.patch b/target/linux/etrax/patches/generic_2.6/007-samsung_flash.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/007-samsung_flash.patch
rename to target/linux/etrax/patches/generic_2.6/007-samsung_flash.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/009-revert_intel_flash_breakage.patch b/target/linux/etrax/patches/generic_2.6/009-revert_intel_flash_breakage.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/009-revert_intel_flash_breakage.patch
rename to target/linux/etrax/patches/generic_2.6/009-revert_intel_flash_breakage.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/010-disable_old_squashfs_compatibility.patch b/target/linux/etrax/patches/generic_2.6/010-disable_old_squashfs_compatibility.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/010-disable_old_squashfs_compatibility.patch
rename to target/linux/etrax/patches/generic_2.6/010-disable_old_squashfs_compatibility.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/060-rootfs_split.patch b/target/linux/etrax/patches/generic_2.6/060-rootfs_split.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/060-rootfs_split.patch
rename to target/linux/etrax/patches/generic_2.6/060-rootfs_split.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/065-block2mtd_init.patch b/target/linux/etrax/patches/generic_2.6/065-block2mtd_init.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/065-block2mtd_init.patch
rename to target/linux/etrax/patches/generic_2.6/065-block2mtd_init.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/100-netfilter_layer7_2.8.patch b/target/linux/etrax/patches/generic_2.6/100-netfilter_layer7_2.8.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/100-netfilter_layer7_2.8.patch
rename to target/linux/etrax/patches/generic_2.6/100-netfilter_layer7_2.8.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/101-netfilter_layer7_pktmatch.patch b/target/linux/etrax/patches/generic_2.6/101-netfilter_layer7_pktmatch.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/101-netfilter_layer7_pktmatch.patch
rename to target/linux/etrax/patches/generic_2.6/101-netfilter_layer7_pktmatch.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/110-ipp2p_0.8.1rc1.patch b/target/linux/etrax/patches/generic_2.6/110-ipp2p_0.8.1rc1.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/110-ipp2p_0.8.1rc1.patch
rename to target/linux/etrax/patches/generic_2.6/110-ipp2p_0.8.1rc1.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/120-openswan-2.4.0.kernel-2.6-natt.patch b/target/linux/etrax/patches/generic_2.6/120-openswan-2.4.0.kernel-2.6-natt.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/120-openswan-2.4.0.kernel-2.6-natt.patch
rename to target/linux/etrax/patches/generic_2.6/120-openswan-2.4.0.kernel-2.6-natt.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/130-netfilter-ipset.patch b/target/linux/etrax/patches/generic_2.6/130-netfilter-ipset.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/130-netfilter-ipset.patch
rename to target/linux/etrax/patches/generic_2.6/130-netfilter-ipset.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/140-netfilter_time.patch b/target/linux/etrax/patches/generic_2.6/140-netfilter_time.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/140-netfilter_time.patch
rename to target/linux/etrax/patches/generic_2.6/140-netfilter_time.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/150-netfilter_imq.patch b/target/linux/etrax/patches/generic_2.6/150-netfilter_imq.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/150-netfilter_imq.patch
rename to target/linux/etrax/patches/generic_2.6/150-netfilter_imq.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/160-netfilter_route.patch b/target/linux/etrax/patches/generic_2.6/160-netfilter_route.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/160-netfilter_route.patch
rename to target/linux/etrax/patches/generic_2.6/160-netfilter_route.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/170-netfilter_chaostables.patch b/target/linux/etrax/patches/generic_2.6/170-netfilter_chaostables.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/170-netfilter_chaostables.patch
rename to target/linux/etrax/patches/generic_2.6/170-netfilter_chaostables.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/200-sched_esfq.patch b/target/linux/etrax/patches/generic_2.6/200-sched_esfq.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/200-sched_esfq.patch
rename to target/linux/etrax/patches/generic_2.6/200-sched_esfq.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/201-multiple_default_gateways.patch b/target/linux/etrax/patches/generic_2.6/201-multiple_default_gateways.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/201-multiple_default_gateways.patch
rename to target/linux/etrax/patches/generic_2.6/201-multiple_default_gateways.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/204-jffs2_eofdetect.patch b/target/linux/etrax/patches/generic_2.6/204-jffs2_eofdetect.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/204-jffs2_eofdetect.patch
rename to target/linux/etrax/patches/generic_2.6/204-jffs2_eofdetect.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/208-rtl8110sb_fix.patch b/target/linux/etrax/patches/generic_2.6/208-rtl8110sb_fix.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/208-rtl8110sb_fix.patch
rename to target/linux/etrax/patches/generic_2.6/208-rtl8110sb_fix.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/209-mini_fo.patch b/target/linux/etrax/patches/generic_2.6/209-mini_fo.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/209-mini_fo.patch
rename to target/linux/etrax/patches/generic_2.6/209-mini_fo.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/210-d80211_compat.patch b/target/linux/etrax/patches/generic_2.6/210-d80211_compat.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/210-d80211_compat.patch
rename to target/linux/etrax/patches/generic_2.6/210-d80211_compat.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/211-no_block2mtd_readahead.patch b/target/linux/etrax/patches/generic_2.6/211-no_block2mtd_readahead.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/211-no_block2mtd_readahead.patch
rename to target/linux/etrax/patches/generic_2.6/211-no_block2mtd_readahead.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/212-block2mtd_erase_scan.patch b/target/linux/etrax/patches/generic_2.6/212-block2mtd_erase_scan.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/212-block2mtd_erase_scan.patch
rename to target/linux/etrax/patches/generic_2.6/212-block2mtd_erase_scan.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/510-Yaffs.patch b/target/linux/etrax/patches/generic_2.6/510-Yaffs.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/510-Yaffs.patch
rename to target/linux/etrax/patches/generic_2.6/510-Yaffs.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/700-airprime.patch b/target/linux/etrax/patches/generic_2.6/700-airprime.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/700-airprime.patch
rename to target/linux/etrax/patches/generic_2.6/700-airprime.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/900-headers_type_and_time.patch b/target/linux/etrax/patches/generic_2.6/900-headers_type_and_time.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/900-headers_type_and_time.patch
rename to target/linux/etrax/patches/generic_2.6/900-headers_type_and_time.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/901-asm_bitops_include.patch b/target/linux/etrax/patches/generic_2.6/901-asm_bitops_include.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/901-asm_bitops_include.patch
rename to target/linux/etrax/patches/generic_2.6/901-asm_bitops_include.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/902-darwin_scripts_include.patch b/target/linux/etrax/patches/generic_2.6/902-darwin_scripts_include.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/902-darwin_scripts_include.patch
rename to target/linux/etrax/patches/generic_2.6/902-darwin_scripts_include.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/903-stddef_include.patch b/target/linux/etrax/patches/generic_2.6/903-stddef_include.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/903-stddef_include.patch
rename to target/linux/etrax/patches/generic_2.6/903-stddef_include.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/904-ls_time_locale.patch b/target/linux/etrax/patches/generic_2.6/904-ls_time_locale.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/904-ls_time_locale.patch
rename to target/linux/etrax/patches/generic_2.6/904-ls_time_locale.patch
diff --git a/target/linux/etrax-2.6/patches/generic_2.6/905-zydas-zyxel.patch b/target/linux/etrax/patches/generic_2.6/905-zydas-zyxel.patch
similarity index 100%
rename from target/linux/etrax-2.6/patches/generic_2.6/905-zydas-zyxel.patch
rename to target/linux/etrax/patches/generic_2.6/905-zydas-zyxel.patch
diff --git a/target/linux/etrax-2.6/profiles/100-generic.mk b/target/linux/etrax/profiles/100-generic.mk
similarity index 100%
rename from target/linux/etrax-2.6/profiles/100-generic.mk
rename to target/linux/etrax/profiles/100-generic.mk
diff --git a/target/linux/etrax-2.6/profiles/101-vhdl-nofb.mk b/target/linux/etrax/profiles/101-vhdl-nofb.mk
similarity index 100%
rename from target/linux/etrax-2.6/profiles/101-vhdl-nofb.mk
rename to target/linux/etrax/profiles/101-vhdl-nofb.mk
diff --git a/target/linux/iop32x-2.6/Makefile b/target/linux/iop32x/Makefile
similarity index 100%
rename from target/linux/iop32x-2.6/Makefile
rename to target/linux/iop32x/Makefile
diff --git a/target/linux/iop32x-2.6/base-files/default/etc/config/network b/target/linux/iop32x/base-files/default/etc/config/network
similarity index 100%
rename from target/linux/iop32x-2.6/base-files/default/etc/config/network
rename to target/linux/iop32x/base-files/default/etc/config/network
diff --git a/target/linux/iop32x-2.6/config/default b/target/linux/iop32x/config/default
similarity index 100%
rename from target/linux/iop32x-2.6/config/default
rename to target/linux/iop32x/config/default
diff --git a/target/linux/iop32x-2.6/image/Makefile b/target/linux/iop32x/image/Makefile
similarity index 100%
rename from target/linux/iop32x-2.6/image/Makefile
rename to target/linux/iop32x/image/Makefile
diff --git a/target/linux/ixp4xx-2.6/Makefile b/target/linux/ixp4xx/Makefile
similarity index 100%
rename from target/linux/ixp4xx-2.6/Makefile
rename to target/linux/ixp4xx/Makefile
diff --git a/target/linux/ixp4xx-2.6/base-files/default/etc/config/network b/target/linux/ixp4xx/base-files/default/etc/config/network
similarity index 100%
rename from target/linux/ixp4xx-2.6/base-files/default/etc/config/network
rename to target/linux/ixp4xx/base-files/default/etc/config/network
diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx/config/default
similarity index 100%
rename from target/linux/ixp4xx-2.6/config/default
rename to target/linux/ixp4xx/config/default
diff --git a/target/linux/ixp4xx-2.6/config/profile-FSG3 b/target/linux/ixp4xx/config/profile-FSG3
similarity index 100%
rename from target/linux/ixp4xx-2.6/config/profile-FSG3
rename to target/linux/ixp4xx/config/profile-FSG3
diff --git a/target/linux/ixp4xx-2.6/image/Config.in b/target/linux/ixp4xx/image/Config.in
similarity index 100%
rename from target/linux/ixp4xx-2.6/image/Config.in
rename to target/linux/ixp4xx/image/Config.in
diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx/image/Makefile
similarity index 100%
rename from target/linux/ixp4xx-2.6/image/Makefile
rename to target/linux/ixp4xx/image/Makefile
diff --git a/target/linux/ixp4xx-2.6/image/apex/Makefile b/target/linux/ixp4xx/image/apex/Makefile
similarity index 100%
rename from target/linux/ixp4xx-2.6/image/apex/Makefile
rename to target/linux/ixp4xx/image/apex/Makefile
diff --git a/target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch b/target/linux/ixp4xx/image/apex/patches/100-slugos-nslu2-armeb_config.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/image/apex/patches/100-slugos-nslu2-armeb_config.patch
rename to target/linux/ixp4xx/image/apex/patches/100-slugos-nslu2-armeb_config.patch
diff --git a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile b/target/linux/ixp4xx/image/npe-ucode/Makefile
similarity index 100%
rename from target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
rename to target/linux/ixp4xx/image/npe-ucode/Makefile
diff --git a/target/linux/ixp4xx-2.6/image/npe-ucode/src/IxNpeMicrocode.h b/target/linux/ixp4xx/image/npe-ucode/src/IxNpeMicrocode.h
similarity index 100%
rename from target/linux/ixp4xx-2.6/image/npe-ucode/src/IxNpeMicrocode.h
rename to target/linux/ixp4xx/image/npe-ucode/src/IxNpeMicrocode.h
diff --git a/target/linux/ixp4xx-2.6/patches/050-dsmg600_upstream_support.patch b/target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/050-dsmg600_upstream_support.patch
rename to target/linux/ixp4xx/patches/050-dsmg600_upstream_support.patch
diff --git a/target/linux/ixp4xx-2.6/patches/070-ixp4xx_freq_fixup.patch b/target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/070-ixp4xx_freq_fixup.patch
rename to target/linux/ixp4xx/patches/070-ixp4xx_freq_fixup.patch
diff --git a/target/linux/ixp4xx-2.6/patches/080-trivial_nslu2_nas100d_cleanup.patch b/target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/080-trivial_nslu2_nas100d_cleanup.patch
rename to target/linux/ixp4xx/patches/080-trivial_nslu2_nas100d_cleanup.patch
diff --git a/target/linux/ixp4xx-2.6/patches/100-npe_driver.patch b/target/linux/ixp4xx/patches/100-npe_driver.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/100-npe_driver.patch
rename to target/linux/ixp4xx/patches/100-npe_driver.patch
diff --git a/target/linux/ixp4xx-2.6/patches/110-ixp4xx_net_driver_fix_mac_handling.patch b/target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/110-ixp4xx_net_driver_fix_mac_handling.patch
rename to target/linux/ixp4xx/patches/110-ixp4xx_net_driver_fix_mac_handling.patch
diff --git a/target/linux/ixp4xx-2.6/patches/139-ixp4xx_net_driver_mtd_load_fw.patch b/target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/139-ixp4xx_net_driver_mtd_load_fw.patch
rename to target/linux/ixp4xx/patches/139-ixp4xx_net_driver_mtd_load_fw.patch
diff --git a/target/linux/ixp4xx-2.6/patches/140-ixp4xx_net_driver_no_phy.patch b/target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/140-ixp4xx_net_driver_no_phy.patch
rename to target/linux/ixp4xx/patches/140-ixp4xx_net_driver_no_phy.patch
diff --git a/target/linux/ixp4xx-2.6/patches/141-nslu2_setup_mac.patch b/target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/141-nslu2_setup_mac.patch
rename to target/linux/ixp4xx/patches/141-nslu2_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/142-nas100d_setup_mac.patch b/target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/142-nas100d_setup_mac.patch
rename to target/linux/ixp4xx/patches/142-nas100d_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/143-nslu2_mtd_microcode.patch b/target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/143-nslu2_mtd_microcode.patch
rename to target/linux/ixp4xx/patches/143-nslu2_mtd_microcode.patch
diff --git a/target/linux/ixp4xx-2.6/patches/144-nas100d_mtd_microcode.patch b/target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/144-nas100d_mtd_microcode.patch
rename to target/linux/ixp4xx/patches/144-nas100d_mtd_microcode.patch
diff --git a/target/linux/ixp4xx-2.6/patches/152-nas100d_mtd_load_mac.patch b/target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/152-nas100d_mtd_load_mac.patch
rename to target/linux/ixp4xx/patches/152-nas100d_mtd_load_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/153-nslu2_mtd_load_mac.patch b/target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/153-nslu2_mtd_load_mac.patch
rename to target/linux/ixp4xx/patches/153-nslu2_mtd_load_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/160-nas100d_artop_temp_fix.patch b/target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/160-nas100d_artop_temp_fix.patch
rename to target/linux/ixp4xx/patches/160-nas100d_artop_temp_fix.patch
diff --git a/target/linux/ixp4xx-2.6/patches/178-via_velocity_bigendian.patch b/target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/178-via_velocity_bigendian.patch
rename to target/linux/ixp4xx/patches/178-via_velocity_bigendian.patch
diff --git a/target/linux/ixp4xx-2.6/patches/185-nslu2_rtc_fixup.patch b/target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/185-nslu2_rtc_fixup.patch
rename to target/linux/ixp4xx/patches/185-nslu2_rtc_fixup.patch
diff --git a/target/linux/ixp4xx-2.6/patches/186-nas100d_rtc_fixup.patch b/target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/186-nas100d_rtc_fixup.patch
rename to target/linux/ixp4xx/patches/186-nas100d_rtc_fixup.patch
diff --git a/target/linux/ixp4xx-2.6/patches/187-dsmg600_rtc_fixup.patch b/target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/187-dsmg600_rtc_fixup.patch
rename to target/linux/ixp4xx/patches/187-dsmg600_rtc_fixup.patch
diff --git a/target/linux/ixp4xx-2.6/patches/200-gateway_7001.patch b/target/linux/ixp4xx/patches/200-gateway_7001.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/200-gateway_7001.patch
rename to target/linux/ixp4xx/patches/200-gateway_7001.patch
diff --git a/target/linux/ixp4xx-2.6/patches/210-gateway_7001_setup_mac.patch b/target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/210-gateway_7001_setup_mac.patch
rename to target/linux/ixp4xx/patches/210-gateway_7001_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/212-gateway_7001_mtd_microcode.patch b/target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/212-gateway_7001_mtd_microcode.patch
rename to target/linux/ixp4xx/patches/212-gateway_7001_mtd_microcode.patch
diff --git a/target/linux/ixp4xx-2.6/patches/300-wg302v2.patch b/target/linux/ixp4xx/patches/300-wg302v2.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/300-wg302v2.patch
rename to target/linux/ixp4xx/patches/300-wg302v2.patch
diff --git a/target/linux/ixp4xx-2.6/patches/310-wg302v2_setup_mac.patch b/target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/310-wg302v2_setup_mac.patch
rename to target/linux/ixp4xx/patches/310-wg302v2_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/400-pronghorn_metro.patch b/target/linux/ixp4xx/patches/400-pronghorn_metro.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/400-pronghorn_metro.patch
rename to target/linux/ixp4xx/patches/400-pronghorn_metro.patch
diff --git a/target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch b/target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/410-pronghorn_metro_setup_mac.patch
rename to target/linux/ixp4xx/patches/410-pronghorn_metro_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/420-pronghorn_metro_mtd_microcode.patch b/target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/420-pronghorn_metro_mtd_microcode.patch
rename to target/linux/ixp4xx/patches/420-pronghorn_metro_mtd_microcode.patch
diff --git a/target/linux/ixp4xx-2.6/patches/430-pronghorn_metro_cf.patch b/target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/430-pronghorn_metro_cf.patch
rename to target/linux/ixp4xx/patches/430-pronghorn_metro_cf.patch
diff --git a/target/linux/ixp4xx-2.6/patches/500-compex.patch b/target/linux/ixp4xx/patches/500-compex.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/500-compex.patch
rename to target/linux/ixp4xx/patches/500-compex.patch
diff --git a/target/linux/ixp4xx-2.6/patches/510-compex_setup_mac.patch b/target/linux/ixp4xx/patches/510-compex_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/510-compex_setup_mac.patch
rename to target/linux/ixp4xx/patches/510-compex_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/520-compex_mtd_microcode.patch b/target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/520-compex_mtd_microcode.patch
rename to target/linux/ixp4xx/patches/520-compex_mtd_microcode.patch
diff --git a/target/linux/ixp4xx-2.6/patches/600-wrt300nv2.patch b/target/linux/ixp4xx/patches/600-wrt300nv2.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/600-wrt300nv2.patch
rename to target/linux/ixp4xx/patches/600-wrt300nv2.patch
diff --git a/target/linux/ixp4xx-2.6/patches/610-wrt300nv2_setup_mac.patch b/target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/610-wrt300nv2_setup_mac.patch
rename to target/linux/ixp4xx/patches/610-wrt300nv2_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/720-avila_setup_mac.patch b/target/linux/ixp4xx/patches/720-avila_setup_mac.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/720-avila_setup_mac.patch
rename to target/linux/ixp4xx/patches/720-avila_setup_mac.patch
diff --git a/target/linux/ixp4xx-2.6/patches/740-avila_loft_mac_platform.patch b/target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/740-avila_loft_mac_platform.patch
rename to target/linux/ixp4xx/patches/740-avila_loft_mac_platform.patch
diff --git a/target/linux/ixp4xx-2.6/patches/750-avila_mtd_microcode.patch b/target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/750-avila_mtd_microcode.patch
rename to target/linux/ixp4xx/patches/750-avila_mtd_microcode.patch
diff --git a/target/linux/ixp4xx-2.6/patches/800-eeprom_new_notifier.patch b/target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/800-eeprom_new_notifier.patch
rename to target/linux/ixp4xx/patches/800-eeprom_new_notifier.patch
diff --git a/target/linux/ixp4xx-2.6/patches/900-no_loader_workaround.patch b/target/linux/ixp4xx/patches/900-no_loader_workaround.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/900-no_loader_workaround.patch
rename to target/linux/ixp4xx/patches/900-no_loader_workaround.patch
diff --git a/target/linux/ixp4xx-2.6/patches/996-fsg3_support.patch b/target/linux/ixp4xx/patches/996-fsg3_support.patch
similarity index 100%
rename from target/linux/ixp4xx-2.6/patches/996-fsg3_support.patch
rename to target/linux/ixp4xx/patches/996-fsg3_support.patch
diff --git a/target/linux/ixp4xx-2.6/profiles/100-Default.mk b/target/linux/ixp4xx/profiles/100-Default.mk
similarity index 100%
rename from target/linux/ixp4xx-2.6/profiles/100-Default.mk
rename to target/linux/ixp4xx/profiles/100-Default.mk
diff --git a/target/linux/ixp4xx-2.6/profiles/200-NSLU2.mk b/target/linux/ixp4xx/profiles/200-NSLU2.mk
similarity index 100%
rename from target/linux/ixp4xx-2.6/profiles/200-NSLU2.mk
rename to target/linux/ixp4xx/profiles/200-NSLU2.mk
diff --git a/target/linux/ixp4xx-2.6/profiles/300-NAS100d.mk b/target/linux/ixp4xx/profiles/300-NAS100d.mk
similarity index 100%
rename from target/linux/ixp4xx-2.6/profiles/300-NAS100d.mk
rename to target/linux/ixp4xx/profiles/300-NAS100d.mk
diff --git a/target/linux/ixp4xx-2.6/profiles/400-DSMG600RevA.mk b/target/linux/ixp4xx/profiles/400-DSMG600RevA.mk
similarity index 100%
rename from target/linux/ixp4xx-2.6/profiles/400-DSMG600RevA.mk
rename to target/linux/ixp4xx/profiles/400-DSMG600RevA.mk
diff --git a/target/linux/ixp4xx-2.6/profiles/500-FSG3.mk b/target/linux/ixp4xx/profiles/500-FSG3.mk
similarity index 100%
rename from target/linux/ixp4xx-2.6/profiles/500-FSG3.mk
rename to target/linux/ixp4xx/profiles/500-FSG3.mk
diff --git a/target/linux/magicbox-2.6/Makefile b/target/linux/magicbox/Makefile
similarity index 100%
rename from target/linux/magicbox-2.6/Makefile
rename to target/linux/magicbox/Makefile
diff --git a/target/linux/magicbox-2.6/config/default b/target/linux/magicbox/config/default
similarity index 100%
rename from target/linux/magicbox-2.6/config/default
rename to target/linux/magicbox/config/default
diff --git a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c b/target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c
similarity index 100%
rename from target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.c
rename to target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.c
diff --git a/target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.h b/target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.h
similarity index 100%
rename from target/linux/magicbox-2.6/files/arch/ppc/platforms/4xx/magicbox.h
rename to target/linux/magicbox/files/arch/ppc/platforms/4xx/magicbox.h
diff --git a/target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c b/target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c
similarity index 100%
rename from target/linux/magicbox-2.6/files/drivers/ide/ppc/magicbox_ide.c
rename to target/linux/magicbox/files/drivers/ide/ppc/magicbox_ide.c
diff --git a/target/linux/magicbox-2.6/image/Makefile b/target/linux/magicbox/image/Makefile
similarity index 100%
rename from target/linux/magicbox-2.6/image/Makefile
rename to target/linux/magicbox/image/Makefile
diff --git a/target/linux/magicbox-2.6/patches-2.6.22/001-magicbox_support.patch b/target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch
similarity index 100%
rename from target/linux/magicbox-2.6/patches-2.6.22/001-magicbox_support.patch
rename to target/linux/magicbox/patches-2.6.22/001-magicbox_support.patch
diff --git a/target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch b/target/linux/magicbox/patches-2.6.22/100-cf_slot.patch
similarity index 100%
rename from target/linux/magicbox-2.6/patches-2.6.22/100-cf_slot.patch
rename to target/linux/magicbox/patches-2.6.22/100-cf_slot.patch
diff --git a/target/linux/pxa-2.6/Makefile b/target/linux/pxa/Makefile
similarity index 100%
rename from target/linux/pxa-2.6/Makefile
rename to target/linux/pxa/Makefile
diff --git a/target/linux/pxa-2.6/config/default b/target/linux/pxa/config/default
similarity index 100%
rename from target/linux/pxa-2.6/config/default
rename to target/linux/pxa/config/default
diff --git a/target/linux/pxa-2.6/image b/target/linux/pxa/image
similarity index 100%
rename from target/linux/pxa-2.6/image
rename to target/linux/pxa/image
diff --git a/target/linux/pxa-2.6/patches/000-cpufreq.patch b/target/linux/pxa/patches/000-cpufreq.patch
similarity index 100%
rename from target/linux/pxa-2.6/patches/000-cpufreq.patch
rename to target/linux/pxa/patches/000-cpufreq.patch
diff --git a/target/linux/pxa-2.6/patches/001-pm.patch b/target/linux/pxa/patches/001-pm.patch
similarity index 100%
rename from target/linux/pxa-2.6/patches/001-pm.patch
rename to target/linux/pxa/patches/001-pm.patch
diff --git a/target/linux/pxa-2.6/patches/002-usb_gadget.patch b/target/linux/pxa/patches/002-usb_gadget.patch
similarity index 100%
rename from target/linux/pxa-2.6/patches/002-usb_gadget.patch
rename to target/linux/pxa/patches/002-usb_gadget.patch
diff --git a/target/linux/pxa-2.6/patches/004-skbuf_hack.patch b/target/linux/pxa/patches/004-skbuf_hack.patch
similarity index 100%
rename from target/linux/pxa-2.6/patches/004-skbuf_hack.patch
rename to target/linux/pxa/patches/004-skbuf_hack.patch
diff --git a/target/linux/pxa-2.6/patches/005-mtd.patch b/target/linux/pxa/patches/005-mtd.patch
similarity index 100%
rename from target/linux/pxa-2.6/patches/005-mtd.patch
rename to target/linux/pxa/patches/005-mtd.patch
diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532/Makefile
similarity index 100%
rename from target/linux/rb532-2.6/Makefile
rename to target/linux/rb532/Makefile
diff --git a/target/linux/rb532-2.6/base-files.mk b/target/linux/rb532/base-files.mk
similarity index 100%
rename from target/linux/rb532-2.6/base-files.mk
rename to target/linux/rb532/base-files.mk
diff --git a/target/linux/rb532-2.6/base-files/default/etc/config/network b/target/linux/rb532/base-files/default/etc/config/network
similarity index 100%
rename from target/linux/rb532-2.6/base-files/default/etc/config/network
rename to target/linux/rb532/base-files/default/etc/config/network
diff --git a/target/linux/rb532-2.6/base-files/default/etc/diag.sh b/target/linux/rb532/base-files/default/etc/diag.sh
similarity index 100%
rename from target/linux/rb532-2.6/base-files/default/etc/diag.sh
rename to target/linux/rb532/base-files/default/etc/diag.sh
diff --git a/target/linux/rb532-2.6/base-files/default/sbin/cf2nand b/target/linux/rb532/base-files/default/sbin/cf2nand
similarity index 100%
rename from target/linux/rb532-2.6/base-files/default/sbin/cf2nand
rename to target/linux/rb532/base-files/default/sbin/cf2nand
diff --git a/target/linux/rb532-2.6/base-files/default/sbin/wget2nand b/target/linux/rb532/base-files/default/sbin/wget2nand
similarity index 100%
rename from target/linux/rb532-2.6/base-files/default/sbin/wget2nand
rename to target/linux/rb532/base-files/default/sbin/wget2nand
diff --git a/target/linux/rb532-2.6/config/default b/target/linux/rb532/config/default
similarity index 100%
rename from target/linux/rb532-2.6/config/default
rename to target/linux/rb532/config/default
diff --git a/target/linux/rb532-2.6/files/arch/mips/pci/fixup-rb500.c b/target/linux/rb532/files/arch/mips/pci/fixup-rb500.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/pci/fixup-rb500.c
rename to target/linux/rb532/files/arch/mips/pci/fixup-rb500.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/pci/ops-rc32434.c b/target/linux/rb532/files/arch/mips/pci/ops-rc32434.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/pci/ops-rc32434.c
rename to target/linux/rb532/files/arch/mips/pci/ops-rc32434.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/pci/pci-rc32434.c b/target/linux/rb532/files/arch/mips/pci/pci-rc32434.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/pci/pci-rc32434.c
rename to target/linux/rb532/files/arch/mips/pci/pci-rc32434.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/Makefile b/target/linux/rb532/files/arch/mips/rb500/Makefile
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/Makefile
rename to target/linux/rb532/files/arch/mips/rb500/Makefile
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/devices.c b/target/linux/rb532/files/arch/mips/rb500/devices.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/devices.c
rename to target/linux/rb532/files/arch/mips/rb500/devices.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/irq.c b/target/linux/rb532/files/arch/mips/rb500/irq.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/irq.c
rename to target/linux/rb532/files/arch/mips/rb500/irq.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/misc.c b/target/linux/rb532/files/arch/mips/rb500/misc.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/misc.c
rename to target/linux/rb532/files/arch/mips/rb500/misc.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/prom.c b/target/linux/rb532/files/arch/mips/rb500/prom.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/prom.c
rename to target/linux/rb532/files/arch/mips/rb500/prom.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/serial.c b/target/linux/rb532/files/arch/mips/rb500/serial.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/serial.c
rename to target/linux/rb532/files/arch/mips/rb500/serial.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/setup.c b/target/linux/rb532/files/arch/mips/rb500/setup.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/setup.c
rename to target/linux/rb532/files/arch/mips/rb500/setup.c
diff --git a/target/linux/rb532-2.6/files/arch/mips/rb500/time.c b/target/linux/rb532/files/arch/mips/rb500/time.c
similarity index 100%
rename from target/linux/rb532-2.6/files/arch/mips/rb500/time.c
rename to target/linux/rb532/files/arch/mips/rb500/time.c
diff --git a/target/linux/rb532-2.6/files/drivers/block/rb500/Makefile b/target/linux/rb532/files/drivers/block/rb500/Makefile
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/block/rb500/Makefile
rename to target/linux/rb532/files/drivers/block/rb500/Makefile
diff --git a/target/linux/rb532-2.6/files/drivers/block/rb500/ata.c b/target/linux/rb532/files/drivers/block/rb500/ata.c
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/block/rb500/ata.c
rename to target/linux/rb532/files/drivers/block/rb500/ata.c
diff --git a/target/linux/rb532-2.6/files/drivers/block/rb500/ata.h b/target/linux/rb532/files/drivers/block/rb500/ata.h
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/block/rb500/ata.h
rename to target/linux/rb532/files/drivers/block/rb500/ata.h
diff --git a/target/linux/rb532-2.6/files/drivers/block/rb500/bdev.c b/target/linux/rb532/files/drivers/block/rb500/bdev.c
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/block/rb500/bdev.c
rename to target/linux/rb532/files/drivers/block/rb500/bdev.c
diff --git a/target/linux/rb532-2.6/files/drivers/leds/leds-rb500.c b/target/linux/rb532/files/drivers/leds/leds-rb500.c
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/leds/leds-rb500.c
rename to target/linux/rb532/files/drivers/leds/leds-rb500.c
diff --git a/target/linux/rb532-2.6/files/drivers/mtd/nand/rbmipsnand.c b/target/linux/rb532/files/drivers/mtd/nand/rbmipsnand.c
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/mtd/nand/rbmipsnand.c
rename to target/linux/rb532/files/drivers/mtd/nand/rbmipsnand.c
diff --git a/target/linux/rb532-2.6/files/drivers/net/korina.c b/target/linux/rb532/files/drivers/net/korina.c
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/net/korina.c
rename to target/linux/rb532/files/drivers/net/korina.c
diff --git a/target/linux/rb532-2.6/files/drivers/net/rc32434_eth.h b/target/linux/rb532/files/drivers/net/rc32434_eth.h
similarity index 100%
rename from target/linux/rb532-2.6/files/drivers/net/rc32434_eth.h
rename to target/linux/rb532/files/drivers/net/rc32434_eth.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/ddr.h b/target/linux/rb532/files/include/asm-mips/rc32434/ddr.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/ddr.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/ddr.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/dma.h b/target/linux/rb532/files/include/asm-mips/rc32434/dma.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/dma.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/dma.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/dma_v.h b/target/linux/rb532/files/include/asm-mips/rc32434/dma_v.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/dma_v.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/dma_v.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/eth.h b/target/linux/rb532/files/include/asm-mips/rc32434/eth.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/eth.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/eth.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/eth_v.h b/target/linux/rb532/files/include/asm-mips/rc32434/eth_v.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/eth_v.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/eth_v.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/gpio.h b/target/linux/rb532/files/include/asm-mips/rc32434/gpio.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/gpio.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/gpio.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/irq.h b/target/linux/rb532/files/include/asm-mips/rc32434/irq.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/irq.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/irq.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/pci.h b/target/linux/rb532/files/include/asm-mips/rc32434/pci.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/pci.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/pci.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/rb.h b/target/linux/rb532/files/include/asm-mips/rc32434/rb.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/rb.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/rb.h
diff --git a/target/linux/rb532-2.6/files/include/asm-mips/rc32434/rc32434.h b/target/linux/rb532/files/include/asm-mips/rc32434/rc32434.h
similarity index 100%
rename from target/linux/rb532-2.6/files/include/asm-mips/rc32434/rc32434.h
rename to target/linux/rb532/files/include/asm-mips/rc32434/rc32434.h
diff --git a/target/linux/rb532-2.6/image/Makefile b/target/linux/rb532/image/Makefile
similarity index 100%
rename from target/linux/rb532-2.6/image/Makefile
rename to target/linux/rb532/image/Makefile
diff --git a/target/linux/rb532-2.6/image/gen_image.sh b/target/linux/rb532/image/gen_image.sh
similarity index 100%
rename from target/linux/rb532-2.6/image/gen_image.sh
rename to target/linux/rb532/image/gen_image.sh
diff --git a/target/linux/rb532-2.6/patches/100-rb5xx_support.patch b/target/linux/rb532/patches/100-rb5xx_support.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/100-rb5xx_support.patch
rename to target/linux/rb532/patches/100-rb5xx_support.patch
diff --git a/target/linux/rb532-2.6/patches/110-korina_ethernet.patch b/target/linux/rb532/patches/110-korina_ethernet.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/110-korina_ethernet.patch
rename to target/linux/rb532/patches/110-korina_ethernet.patch
diff --git a/target/linux/rb532-2.6/patches/120-cf.patch b/target/linux/rb532/patches/120-cf.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/120-cf.patch
rename to target/linux/rb532/patches/120-cf.patch
diff --git a/target/linux/rb532-2.6/patches/140-cmdline_hack.patch b/target/linux/rb532/patches/140-cmdline_hack.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/140-cmdline_hack.patch
rename to target/linux/rb532/patches/140-cmdline_hack.patch
diff --git a/target/linux/rb532-2.6/patches/200-bridge_resource_hack.patch b/target/linux/rb532/patches/200-bridge_resource_hack.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/200-bridge_resource_hack.patch
rename to target/linux/rb532/patches/200-bridge_resource_hack.patch
diff --git a/target/linux/rb532-2.6/patches/220-serial_fix.patch b/target/linux/rb532/patches/220-serial_fix.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/220-serial_fix.patch
rename to target/linux/rb532/patches/220-serial_fix.patch
diff --git a/target/linux/rb532-2.6/patches/240-via_rhine_performance.patch b/target/linux/rb532/patches/240-via_rhine_performance.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/240-via_rhine_performance.patch
rename to target/linux/rb532/patches/240-via_rhine_performance.patch
diff --git a/target/linux/rb532-2.6/patches/500-Nand.patch b/target/linux/rb532/patches/500-Nand.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/500-Nand.patch
rename to target/linux/rb532/patches/500-Nand.patch
diff --git a/target/linux/rb532-2.6/patches/510-rb500_led.patch b/target/linux/rb532/patches/510-rb500_led.patch
similarity index 100%
rename from target/linux/rb532-2.6/patches/510-rb500_led.patch
rename to target/linux/rb532/patches/510-rb500_led.patch
diff --git a/target/linux/rb532-2.6/src/patch-cmdline.c b/target/linux/rb532/src/patch-cmdline.c
similarity index 100%
rename from target/linux/rb532-2.6/src/patch-cmdline.c
rename to target/linux/rb532/src/patch-cmdline.c
diff --git a/target/linux/rdc-2.6/Makefile b/target/linux/rdc/Makefile
similarity index 100%
rename from target/linux/rdc-2.6/Makefile
rename to target/linux/rdc/Makefile
diff --git a/target/linux/rdc-2.6/base-files/default/etc/diag.sh b/target/linux/rdc/base-files/default/etc/diag.sh
similarity index 100%
rename from target/linux/rdc-2.6/base-files/default/etc/diag.sh
rename to target/linux/rdc/base-files/default/etc/diag.sh
diff --git a/target/linux/rdc-2.6/config/default b/target/linux/rdc/config/default
similarity index 100%
rename from target/linux/rdc-2.6/config/default
rename to target/linux/rdc/config/default
diff --git a/target/linux/rdc-2.6/config/profile-wl153 b/target/linux/rdc/config/profile-wl153
similarity index 100%
rename from target/linux/rdc-2.6/config/profile-wl153
rename to target/linux/rdc/config/profile-wl153
diff --git a/target/linux/rdc-2.6/files/arch/i386/kernel/cpu/rdc.c b/target/linux/rdc/files/arch/i386/kernel/cpu/rdc.c
similarity index 100%
rename from target/linux/rdc-2.6/files/arch/i386/kernel/cpu/rdc.c
rename to target/linux/rdc/files/arch/i386/kernel/cpu/rdc.c
diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/Makefile b/target/linux/rdc/files/arch/i386/mach-rdc/Makefile
similarity index 100%
rename from target/linux/rdc-2.6/files/arch/i386/mach-rdc/Makefile
rename to target/linux/rdc/files/arch/i386/mach-rdc/Makefile
diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c b/target/linux/rdc/files/arch/i386/mach-rdc/gpio.c
similarity index 100%
rename from target/linux/rdc-2.6/files/arch/i386/mach-rdc/gpio.c
rename to target/linux/rdc/files/arch/i386/mach-rdc/gpio.c
diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/platform.c b/target/linux/rdc/files/arch/i386/mach-rdc/platform.c
similarity index 100%
rename from target/linux/rdc-2.6/files/arch/i386/mach-rdc/platform.c
rename to target/linux/rdc/files/arch/i386/mach-rdc/platform.c
diff --git a/target/linux/rdc-2.6/files/arch/i386/mach-rdc/wdt.c b/target/linux/rdc/files/arch/i386/mach-rdc/wdt.c
similarity index 100%
rename from target/linux/rdc-2.6/files/arch/i386/mach-rdc/wdt.c
rename to target/linux/rdc/files/arch/i386/mach-rdc/wdt.c
diff --git a/target/linux/rdc-2.6/files/drivers/leds/leds-rdc3211.c b/target/linux/rdc/files/drivers/leds/leds-rdc3211.c
similarity index 100%
rename from target/linux/rdc-2.6/files/drivers/leds/leds-rdc3211.c
rename to target/linux/rdc/files/drivers/leds/leds-rdc3211.c
diff --git a/target/linux/rdc-2.6/files/drivers/mtd/maps/imghdr.h b/target/linux/rdc/files/drivers/mtd/maps/imghdr.h
similarity index 100%
rename from target/linux/rdc-2.6/files/drivers/mtd/maps/imghdr.h
rename to target/linux/rdc/files/drivers/mtd/maps/imghdr.h
diff --git a/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c b/target/linux/rdc/files/drivers/mtd/maps/rdc3210.c
similarity index 100%
rename from target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c
rename to target/linux/rdc/files/drivers/mtd/maps/rdc3210.c
diff --git a/target/linux/rdc-2.6/files/drivers/net/r6040.c b/target/linux/rdc/files/drivers/net/r6040.c
similarity index 100%
rename from target/linux/rdc-2.6/files/drivers/net/r6040.c
rename to target/linux/rdc/files/drivers/net/r6040.c
diff --git a/target/linux/rdc-2.6/files/include/asm-i386/gpio.h b/target/linux/rdc/files/include/asm-i386/gpio.h
similarity index 100%
rename from target/linux/rdc-2.6/files/include/asm-i386/gpio.h
rename to target/linux/rdc/files/include/asm-i386/gpio.h
diff --git a/target/linux/rdc-2.6/files/include/asm-i386/mach-generic/gpio.h b/target/linux/rdc/files/include/asm-i386/mach-generic/gpio.h
similarity index 100%
rename from target/linux/rdc-2.6/files/include/asm-i386/mach-generic/gpio.h
rename to target/linux/rdc/files/include/asm-i386/mach-generic/gpio.h
diff --git a/target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/gpio.h b/target/linux/rdc/files/include/asm-i386/mach-rdc/gpio.h
similarity index 100%
rename from target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/gpio.h
rename to target/linux/rdc/files/include/asm-i386/mach-rdc/gpio.h
diff --git a/target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/rdc321x_defs.h b/target/linux/rdc/files/include/asm-i386/mach-rdc/rdc321x_defs.h
similarity index 100%
rename from target/linux/rdc-2.6/files/include/asm-i386/mach-rdc/rdc321x_defs.h
rename to target/linux/rdc/files/include/asm-i386/mach-rdc/rdc321x_defs.h
diff --git a/target/linux/rdc-2.6/image/Makefile b/target/linux/rdc/image/Makefile
similarity index 100%
rename from target/linux/rdc-2.6/image/Makefile
rename to target/linux/rdc/image/Makefile
diff --git a/target/linux/rdc-2.6/patches/000-rdc_fixes.patch b/target/linux/rdc/patches/000-rdc_fixes.patch
similarity index 100%
rename from target/linux/rdc-2.6/patches/000-rdc_fixes.patch
rename to target/linux/rdc/patches/000-rdc_fixes.patch
diff --git a/target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch b/target/linux/rdc/patches/001-rdc3210_flash_map.patch
similarity index 100%
rename from target/linux/rdc-2.6/patches/001-rdc3210_flash_map.patch
rename to target/linux/rdc/patches/001-rdc3210_flash_map.patch
diff --git a/target/linux/rdc-2.6/patches/002-r6040_ethernet.patch b/target/linux/rdc/patches/002-r6040_ethernet.patch
similarity index 100%
rename from target/linux/rdc-2.6/patches/002-r6040_ethernet.patch
rename to target/linux/rdc/patches/002-r6040_ethernet.patch
diff --git a/target/linux/rdc-2.6/patches/003-rootfstype.patch b/target/linux/rdc/patches/003-rootfstype.patch
similarity index 100%
rename from target/linux/rdc-2.6/patches/003-rootfstype.patch
rename to target/linux/rdc/patches/003-rootfstype.patch
diff --git a/target/linux/rdc-2.6/patches/004-rdc3211_leds.patch b/target/linux/rdc/patches/004-rdc3211_leds.patch
similarity index 100%
rename from target/linux/rdc-2.6/patches/004-rdc3211_leds.patch
rename to target/linux/rdc/patches/004-rdc3211_leds.patch
diff --git a/target/linux/rdc-2.6/patches/005-rdc_x86_cpu_type.patch b/target/linux/rdc/patches/005-rdc_x86_cpu_type.patch
similarity index 100%
rename from target/linux/rdc-2.6/patches/005-rdc_x86_cpu_type.patch
rename to target/linux/rdc/patches/005-rdc_x86_cpu_type.patch
diff --git a/target/linux/rdc-2.6/patches/600-x86_lzma.patch b/target/linux/rdc/patches/600-x86_lzma.patch
similarity index 100%
rename from target/linux/rdc-2.6/patches/600-x86_lzma.patch
rename to target/linux/rdc/patches/600-x86_lzma.patch
diff --git a/target/linux/rdc-2.6/profiles/AR525W.mk b/target/linux/rdc/profiles/AR525W.mk
similarity index 100%
rename from target/linux/rdc-2.6/profiles/AR525W.mk
rename to target/linux/rdc/profiles/AR525W.mk
diff --git a/target/linux/rdc-2.6/profiles/WL-153.mk b/target/linux/rdc/profiles/WL-153.mk
similarity index 100%
rename from target/linux/rdc-2.6/profiles/WL-153.mk
rename to target/linux/rdc/profiles/WL-153.mk
diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte/Makefile
similarity index 100%
rename from target/linux/sibyte-2.6/Makefile
rename to target/linux/sibyte/Makefile
diff --git a/target/linux/sibyte-2.6/base-files/default/etc/config/network b/target/linux/sibyte/base-files/default/etc/config/network
similarity index 100%
rename from target/linux/sibyte-2.6/base-files/default/etc/config/network
rename to target/linux/sibyte/base-files/default/etc/config/network
diff --git a/target/linux/sibyte-2.6/base-files/default/etc/inittab b/target/linux/sibyte/base-files/default/etc/inittab
similarity index 100%
rename from target/linux/sibyte-2.6/base-files/default/etc/inittab
rename to target/linux/sibyte/base-files/default/etc/inittab
diff --git a/target/linux/sibyte-2.6/config/default b/target/linux/sibyte/config/default
similarity index 100%
rename from target/linux/sibyte-2.6/config/default
rename to target/linux/sibyte/config/default
diff --git a/target/linux/sibyte-2.6/image/Makefile b/target/linux/sibyte/image/Makefile
similarity index 100%
rename from target/linux/sibyte-2.6/image/Makefile
rename to target/linux/sibyte/image/Makefile
diff --git a/target/linux/sibyte-2.6/patches/000-DUART.patch b/target/linux/sibyte/patches/000-DUART.patch
similarity index 100%
rename from target/linux/sibyte-2.6/patches/000-DUART.patch
rename to target/linux/sibyte/patches/000-DUART.patch
diff --git a/target/linux/uml-2.6/Makefile b/target/linux/uml/Makefile
similarity index 100%
rename from target/linux/uml-2.6/Makefile
rename to target/linux/uml/Makefile
diff --git a/target/linux/uml-2.6/README b/target/linux/uml/README
similarity index 100%
rename from target/linux/uml-2.6/README
rename to target/linux/uml/README
diff --git a/target/linux/uml-2.6/config/i386 b/target/linux/uml/config/i386
similarity index 100%
rename from target/linux/uml-2.6/config/i386
rename to target/linux/uml/config/i386
diff --git a/target/linux/uml-2.6/config/x86_64 b/target/linux/uml/config/x86_64
similarity index 100%
rename from target/linux/uml-2.6/config/x86_64
rename to target/linux/uml/config/x86_64
diff --git a/target/linux/uml-2.6/image/Makefile b/target/linux/uml/image/Makefile
similarity index 100%
rename from target/linux/uml-2.6/image/Makefile
rename to target/linux/uml/image/Makefile
diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86/Makefile
similarity index 100%
rename from target/linux/x86-2.6/Makefile
rename to target/linux/x86/Makefile
diff --git a/target/linux/x86-2.6/base-files/default/etc/preinit.arch b/target/linux/x86/base-files/default/etc/preinit.arch
similarity index 100%
rename from target/linux/x86-2.6/base-files/default/etc/preinit.arch
rename to target/linux/x86/base-files/default/etc/preinit.arch
diff --git a/target/linux/x86-2.6/base-files/default/lib/upgrade/platform.sh b/target/linux/x86/base-files/default/lib/upgrade/platform.sh
similarity index 100%
rename from target/linux/x86-2.6/base-files/default/lib/upgrade/platform.sh
rename to target/linux/x86/base-files/default/lib/upgrade/platform.sh
diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86/config/default
similarity index 100%
rename from target/linux/x86-2.6/config/default
rename to target/linux/x86/config/default
diff --git a/target/linux/x86-2.6/config/profile-Generic b/target/linux/x86/config/profile-Generic
similarity index 100%
rename from target/linux/x86-2.6/config/profile-Generic
rename to target/linux/x86/config/profile-Generic
diff --git a/target/linux/x86-2.6/config/profile-s100 b/target/linux/x86/config/profile-s100
similarity index 100%
rename from target/linux/x86-2.6/config/profile-s100
rename to target/linux/x86/config/profile-s100
diff --git a/target/linux/x86-2.6/image/Config.in b/target/linux/x86/image/Config.in
similarity index 100%
rename from target/linux/x86-2.6/image/Config.in
rename to target/linux/x86/image/Config.in
diff --git a/target/linux/x86-2.6/image/Makefile b/target/linux/x86/image/Makefile
similarity index 100%
rename from target/linux/x86-2.6/image/Makefile
rename to target/linux/x86/image/Makefile
diff --git a/target/linux/x86-2.6/image/gen_image.sh b/target/linux/x86/image/gen_image.sh
similarity index 100%
rename from target/linux/x86-2.6/image/gen_image.sh
rename to target/linux/x86/image/gen_image.sh
diff --git a/target/linux/x86-2.6/image/grub/Makefile b/target/linux/x86/image/grub/Makefile
similarity index 100%
rename from target/linux/x86-2.6/image/grub/Makefile
rename to target/linux/x86/image/grub/Makefile
diff --git a/target/linux/x86-2.6/image/grub/menu.lst b/target/linux/x86/image/grub/menu.lst
similarity index 100%
rename from target/linux/x86-2.6/image/grub/menu.lst
rename to target/linux/x86/image/grub/menu.lst
diff --git a/target/linux/x86-2.6/image/grub/patches/010-fixes-1.patch b/target/linux/x86/image/grub/patches/010-fixes-1.patch
similarity index 100%
rename from target/linux/x86-2.6/image/grub/patches/010-fixes-1.patch
rename to target/linux/x86/image/grub/patches/010-fixes-1.patch
diff --git a/target/linux/x86-2.6/profiles/000-Generic.mk b/target/linux/x86/profiles/000-Generic.mk
similarity index 100%
rename from target/linux/x86-2.6/profiles/000-Generic.mk
rename to target/linux/x86/profiles/000-Generic.mk
diff --git a/target/linux/x86-2.6/profiles/Soekris.mk b/target/linux/x86/profiles/Soekris.mk
similarity index 100%
rename from target/linux/x86-2.6/profiles/Soekris.mk
rename to target/linux/x86/profiles/Soekris.mk
diff --git a/target/linux/x86-2.6/profiles/s100.mk b/target/linux/x86/profiles/s100.mk
similarity index 100%
rename from target/linux/x86-2.6/profiles/s100.mk
rename to target/linux/x86/profiles/s100.mk