Merge branch 'for-linus' into for-next

Back-merged for refactoring beep stuff.