Merge with git://kernel.org/pub/scm/git/git.git