Merge branch 'stmmac-cleanups'