Renamed Biamp Labrinth-SuperIO to LabX Labrinth.
Removing unnecessary vendor folders in platform area and arch.  Moving branch platform folder.
Removing unnecessary arch directories.
Merge branch 'InfernoBranch'

Conflicts:
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Garcia/Makefile
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Garcia/garcia_control.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Garcia/garcia_fpga.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Garcia/garcia_fpga_priv.h
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Inferno/Inferno_setup.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Inferno/Makefile
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Inferno/mv88e6350R.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Inferno/mv88e6350R.h
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Inferno/mv88e6350R_defs.h
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Labrinth-AVB/Makefile
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Labrinth-AVB/labrinth_avb_packetizer.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Labrinth-AVB/labrinth_avb_packetizer.h
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Labrinth-AVB/labrinth_legacy_bridge.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Labrinth-AVB/labrinth_legacy_bridge.h
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Labrinth-AVB/labrinth_tdm_output.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Labrinth-AVB/labrinth_tdm_output.h
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Mosaic/Makefile
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Mosaic/aes3_rx.c
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Mosaic/aes3_rx.h
	uClinux-dist/linux-2.6.x/arch/microblaze/platform/LabX/Mosaic/wclock_gpio.c
	uClinux-dist/vendors/Avid/Garcia/config.uClibc
	uClinux-dist/vendors/Avid/Garcia/etc/avahi-autoipd.action
	uClinux-dist/vendors/Avid/Garcia/etc/avahi-daemon.conf
	uClinux-dist/vendors/Avid/Garcia/etc/inetd.conf
	uClinux-dist/vendors/Avid/Garcia/etc/inittab.agetty
	uClinux-dist/vendors/Avid/Garcia/etc/inittab.config
	uClinux-dist/vendors/Avid/Garcia/etc/inittab.sh
	uClinux-dist/vendors/Avid/Garcia/etc/passwd
	uClinux-dist/vendors/Avid/Garcia/etc/rc/avahi-autoipd-wrapper
	uClinux-dist/vendors/Avid/Garcia/etc/rc/checkroot
	uClinux-dist/vendors/Avid/Garcia/etc/rc/dhcpcd-new
	uClinux-dist/vendors/Avid/Garcia/etc/rc/dhcpcd-new.no-resolv.conf
	uClinux-dist/vendors/Avid/Garcia/etc/rc/flatfsd
	uClinux-dist/vendors/Avid/Garcia/etc/rc/inetd
	uClinux-dist/vendors/Avid/Garcia/etc/rc/reboot
	uClinux-dist/vendors/Avid/Garcia/etc/rc/start
	uClinux-dist/vendors/Avid/Garcia/etc/rc/thttpd
	uClinux-dist/vendors/Avid/Garcia/etc/resolv.conf
	uClinux-dist/vendors/Biamp/Labrinth-AVB-SuperIO/etc/rc/hostname
	uClinux-dist/vendors/Biamp/Labrinth-AVB-SuperIO/etc/rc/mountfs
	uClinux-dist/vendors/LabX/AVBX/config.arch
	uClinux-dist/vendors/LabX/AVBX/config.device-2.6.x
	uClinux-dist/vendors/LabX/AVBX/config.uClibc
	uClinux-dist/vendors/LabX/AVBX/etc/avahi-autoipd.action
	uClinux-dist/vendors/LabX/AVBX/etc/avahi-daemon.conf
	uClinux-dist/vendors/LabX/AVBX/etc/inetd.conf
	uClinux-dist/vendors/LabX/AVBX/etc/inittab.agetty
	uClinux-dist/vendors/LabX/AVBX/etc/inittab.config
	uClinux-dist/vendors/LabX/AVBX/etc/inittab.sh
	uClinux-dist/vendors/LabX/AVBX/etc/passwd
	uClinux-dist/vendors/LabX/AVBX/etc/rc/avahi-autoipd-wrapper
	uClinux-dist/vendors/LabX/AVBX/etc/rc/checkroot
	uClinux-dist/vendors/LabX/AVBX/etc/rc/dhcpcd-new
	uClinux-dist/vendors/LabX/AVBX/etc/rc/dhcpcd-new.no-resolv.conf
	uClinux-dist/vendors/LabX/AVBX/etc/rc/flatfsd
	uClinux-dist/vendors/LabX/AVBX/etc/rc/hostname
	uClinux-dist/vendors/LabX/AVBX/etc/rc/inetd
	uClinux-dist/vendors/LabX/AVBX/etc/rc/mountfs
	uClinux-dist/vendors/LabX/AVBX/etc/rc/network
	uClinux-dist/vendors/LabX/AVBX/etc/rc/reboot
	uClinux-dist/vendors/LabX/AVBX/etc/rc/start
	uClinux-dist/vendors/LabX/AVBX/etc/rc/sysinit
	uClinux-dist/vendors/LabX/AVBX/etc/rc/thttpd
	uClinux-dist/vendors/LabX/AVBX/etc/resolv.conf
	uClinux-dist/vendors/LabX/AVB_EP/config.arch
	uClinux-dist/vendors/LabX/AVB_EP/config.device-2.6.x
	uClinux-dist/vendors/LabX/AVB_EP/config.linux-2.6.x
	uClinux-dist/vendors/LabX/AVB_EP/config.uClibc
	uClinux-dist/vendors/LabX/AVB_EP/etc/avahi-autoipd.action
	uClinux-dist/vendors/LabX/AVB_EP/etc/avahi-daemon.conf
	uClinux-dist/vendors/LabX/AVB_EP/etc/inetd.conf
	uClinux-dist/vendors/LabX/AVB_EP/etc/inittab.agetty
	uClinux-dist/vendors/LabX/AVB_EP/etc/inittab.config
	uClinux-dist/vendors/LabX/AVB_EP/etc/inittab.sh
	uClinux-dist/vendors/LabX/AVB_EP/etc/passwd
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/avahi-autoipd-wrapper
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/avb_startup
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/checkroot
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/dhcpcd-new
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/dhcpcd-new.no-resolv.conf
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/flatfsd
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/hostname
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/ifconfig
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/inetd
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/network
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/reboot
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/start
	uClinux-dist/vendors/LabX/AVB_EP/etc/rc/thttpd
	uClinux-dist/vendors/LabX/AVB_EP/etc/resolv.conf
	uClinux-dist/vendors/LabX/Essex/Makefile
	uClinux-dist/vendors/LabX/Essex/config.device-2.6.x
	uClinux-dist/vendors/LabX/Essex/config.linux-2.6.x
	uClinux-dist/vendors/LabX/Essex/config.uClibc
	uClinux-dist/vendors/LabX/Essex/config.vendor
	uClinux-dist/vendors/LabX/Essex/etc/avahi-autoipd.action
	uClinux-dist/vendors/LabX/Essex/etc/avahi-daemon.conf
	uClinux-dist/vendors/LabX/Essex/etc/inetd.conf
	uClinux-dist/vendors/LabX/Essex/etc/inittab.agetty
	uClinux-dist/vendors/LabX/Essex/etc/inittab.config
	uClinux-dist/vendors/LabX/Essex/etc/inittab.sh
	uClinux-dist/vendors/LabX/Essex/etc/passwd
	uClinux-dist/vendors/LabX/Essex/etc/rc/avahi-autoipd-wrapper
	uClinux-dist/vendors/LabX/Essex/etc/rc/checkroot
	uClinux-dist/vendors/LabX/Essex/etc/rc/dhcpcd-new
	uClinux-dist/vendors/LabX/Essex/etc/rc/dhcpcd-new.no-resolv.conf
	uClinux-dist/vendors/LabX/Essex/etc/rc/flatfsd
	uClinux-dist/vendors/LabX/Essex/etc/rc/hostname
	uClinux-dist/vendors/LabX/Essex/etc/rc/inetd
	uClinux-dist/vendors/LabX/Essex/etc/rc/mountfs
	uClinux-dist/vendors/LabX/Essex/etc/rc/reboot
	uClinux-dist/vendors/LabX/Essex/etc/rc/start
	uClinux-dist/vendors/LabX/Essex/etc/rc/thttpd
	uClinux-dist/vendors/LabX/Essex/etc/resolv.conf
	uClinux-dist/vendors/LabX/Garcia/Makefile
	uClinux-dist/vendors/LabX/Garcia/config.arch
	uClinux-dist/vendors/LabX/Garcia/config.device-2.6.x
	uClinux-dist/vendors/LabX/Garcia/config.linux-2.6.x
	uClinux-dist/vendors/LabX/Garcia/config.vendor
	uClinux-dist/vendors/LabX/Garcia/etc/avahi-autoipd.action
	uClinux-dist/vendors/LabX/Garcia/etc/avahi-daemon.conf
	uClinux-dist/vendors/LabX/Garcia/etc/boa.conf
	uClinux-dist/vendors/LabX/Garcia/etc/inetd.conf
	uClinux-dist/vendors/LabX/Garcia/etc/inittab.agetty
	uClinux-dist/vendors/LabX/Garcia/etc/inittab.config
	uClinux-dist/vendors/LabX/Garcia/etc/inittab.sh
	uClinux-dist/vendors/LabX/Garcia/etc/mime.types
	uClinux-dist/vendors/LabX/Garcia/etc/passwd
	uClinux-dist/vendors/LabX/Garcia/etc/rc/avahi-autoipd-wrapper
	uClinux-dist/vendors/LabX/Garcia/etc/rc/boa
	uClinux-dist/vendors/LabX/Garcia/etc/rc/checkroot
	uClinux-dist/vendors/LabX/Garcia/etc/rc/dhcpcd-new
	uClinux-dist/vendors/LabX/Garcia/etc/rc/dhcpcd-new.no-resolv.conf
	uClinux-dist/vendors/LabX/Garcia/etc/rc/flatfsd
	uClinux-dist/vendors/LabX/Garcia/etc/rc/hostname
	uClinux-dist/vendors/LabX/Garcia/etc/rc/ifconfig
	uClinux-dist/vendors/LabX/Garcia/etc/rc/inetd
	uClinux-dist/vendors/LabX/Garcia/etc/rc/mountfs
	uClinux-dist/vendors/LabX/Garcia/etc/rc/network
	uClinux-dist/vendors/LabX/Garcia/etc/rc/reboot
	uClinux-dist/vendors/LabX/Garcia/etc/rc/start
	uClinux-dist/vendors/LabX/Garcia/etc/rc/startapps
	uClinux-dist/vendors/LabX/Garcia/etc/rc/sysinit
	uClinux-dist/vendors/LabX/Garcia/etc/rc/thttpd
	uClinux-dist/vendors/LabX/Garcia/etc/resolv.conf
	uClinux-dist/vendors/LabX/Garcia/garcia-LX150.dts
	uClinux-dist/vendors/LabX/Garcia/garcia-LX45.dts
	uClinux-dist/vendors/LabX/Inferno/config.uClibc
	uClinux-dist/vendors/LabX/Inferno/etc/avahi-autoipd.action
	uClinux-dist/vendors/LabX/Inferno/etc/avahi-daemon.conf
	uClinux-dist/vendors/LabX/Inferno/etc/inetd.conf
	uClinux-dist/vendors/LabX/Inferno/etc/inittab.agetty
	uClinux-dist/vendors/LabX/Inferno/etc/inittab.config
	uClinux-dist/vendors/LabX/Inferno/etc/inittab.sh
	uClinux-dist/vendors/LabX/Inferno/etc/passwd
	uClinux-dist/vendors/LabX/Inferno/etc/rc/avahi-autoipd-wrapper
	uClinux-dist/vendors/LabX/Inferno/etc/rc/checkroot
	uClinux-dist/vendors/LabX/Inferno/etc/rc/dhcpcd-new
	uClinux-dist/vendors/LabX/Inferno/etc/rc/dhcpcd-new.no-resolv.conf
	uClinux-dist/vendors/LabX/Inferno/etc/rc/flatfsd
	uClinux-dist/vendors/LabX/Inferno/etc/rc/inetd
	uClinux-dist/vendors/LabX/Inferno/etc/rc/reboot
	uClinux-dist/vendors/LabX/Inferno/etc/rc/start
	uClinux-dist/vendors/LabX/Inferno/etc/rc/thttpd
	uClinux-dist/vendors/LabX/Inferno/etc/resolv.conf
	uClinux-dist/vendors/LabX/Labrinth-AVB/config.arch
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/hostname
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/ifconfig
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/mountfs
	uClinux-dist/vendors/LabX/Mosaic/config.uClibc
	uClinux-dist/vendors/LabX/Mosaic/etc/rc/avb_startup
	uClinux-dist/vendors/LabX/Mosaic/etc/rc/ifconfig
	uClinux-dist/vendors/LabX/Mosaic/etc/rc/sysinit
	uClinux-dist/vendors/LabX/Revolver/Makefile
	uClinux-dist/vendors/LabX/Revolver/config.vendor
	uClinux-dist/vendors/LabX/Revolver/etc/rc/mountfs
	uClinux-dist/vendors/Shure/Inferno/etc/rc/mountfs






















































Merging InfernoBranch to master.