(trying to) Merge of SolidRun and Jon Nettleton Repos with latest 3.10.y kernel