Merge branch 'stmmac-platform-glue'