Merge of SolidRun and Jef Nelson Repos with latest 3.10.y kernel