Merge branch 'ep93xx' into devel