Merge branch 'davinci_emac'