Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus