Merge NetSilicon NS93xx tree