Merge branch 'ep93xx' into for-2.6.36