Merge branch 'topic/ep93xx' into for-linus