Merge branch 'egalax' into for-linus