Merge branches 'misc' and 'devel-stable' into for-linus