Merge branch 'topic/powermac' into for-linus