Renamed Biamp Labrinth-SuperIO to LabX Labrinth.
Renamed Riedel Artist to LabX Mosaic.
removed garcia vendor name
Updated default Mosaic settings.
Merge branch 'Release_2.0_Dev_Branch' of github.com:labx-technologies-llc/mb-linux-labx into Release_2.0_Dev_Branch
Merge branch 'LabrinthAVBBranch-Interop2013'

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/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/linux-2.6.x/include/linux/labx_tdm_audio_defs.h
	uClinux-dist/vendors/Avid/Garcia/config.uClibc
	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/checkroot
	uClinux-dist/vendors/Avid/Garcia/etc/rc/flatfsd
	uClinux-dist/vendors/Avid/Garcia/etc/rc/hostname
	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/ifconfig
	uClinux-dist/vendors/LabX/AVBX/Makefile
	uClinux-dist/vendors/LabX/AVBX/config.linux-2.6.x
	uClinux-dist/vendors/LabX/AVBX/config.vendor
	uClinux-dist/vendors/LabX/AVBX/etc/rc/mountfs
	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.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/Labrinth-AVB/config.arch
	uClinux-dist/vendors/LabX/Labrinth-AVB/config.uClibc
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/avahi-autoipd.action
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/avahi-daemon.conf
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/inetd.conf
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/inittab.agetty
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/inittab.config
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/inittab.sh
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/passwd
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/avahi-autoipd-wrapper
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/checkroot
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/dhcpcd-new
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/dhcpcd-new.no-resolv.conf
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/flatfsd
	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/inetd
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/reboot
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/start
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/rc/thttpd
	uClinux-dist/vendors/LabX/Labrinth-AVB/etc/resolv.conf
	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/Shure/Inferno/Makefile
	uClinux-dist/vendors/Shure/Inferno/config.linux-2.6.x
Enabled BusyBox halt commands for Mosaic platform.
Modified aes3_rx driver to be able to be opened as many times as necessary, added GPIOs for Mosaic buttons, wclk switch, and sync status, added mosaic_meter device to vendor makefile.
Merge branch 'Release_2.0_Dev_Branch' of github.com:labx-technologies-llc/mb-linux-labx into Release_2.0_Dev_Branch
Merge branch 'Release_2.0_Dev_Branch' of github.com:labx-technologies-llc/mb-linux-labx into Release_2.0_Dev_Branch
Merge branch 'Release_2.0_Dev_Branch' of github.com:labx-technologies-llc/mb-linux-labx into Release_2.0_Dev_Branch
Implemented functionality to retrieve MAC address from an arbitrary location in flash. Bug fixes in related files.
Fixed bug with Xilinx GPIO driver when module is used in dual-port mode.
Implemented Mosaic CO3 functionality (metering, new GPIOs for buttons/switches/statuses, kernel/app configuration).
Added boot-up scripts that set up flash config partition and launch the firmware-update script.
`reboot` command works: fixed gpio_keys device structures to not be in __initdata sections, so that they don't get freed and overridden and are valid at shutdown time; enabled CONFIG_SPARTAN_RESET_SPI flag so that ICAP reset code performs a SPI reset.
Merge branch 'MosaicBranch' into Release_2.0_Dev_Branch