Merge branch 'topic/emu10k1' into for-linus