Merge branch 'topic/div64-cleanup' into for-linus