Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus