Merge branch 'linux-mfg' into tx6-mfg-devel