Merge branches 'l2', 'pgt2' and 'misc' into for-linus