Merge branch 'next/fixes-non-critical' into for-next

Merge branch 'next/fixes-non-critical' into for-next

next/fixes-non-critical was rebuilt to do a fresh pull of the base branch
of it, but the only _file contents_ delta is the additional patch on
that branch.

Because of that, just pull in the new one now, even though it messes up
history a bit. We'll clean up when we rebuild for-next next time.

Signed-off-by: Olof Johansson <olof@lixom.net>