Merge branch 'mad' into for-linus