Merge with Linus' current tree

diff --cc Makefile
index a833a856189660f388f9429609220226c625308b,9379e16bb19e6a9f62d5c0af310ae3bb5c951dd1..233d24afad66ae4ec2d7ffb33408a57199013e64
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -40,10 -34,9 +40,10 @@@ PROG=   git-update-cache git-diff-file
        git-unpack-file git-export git-diff-cache git-convert-cache \
        git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
        git-diff-helper git-tar-tree git-local-pull git-write-blob \
-       git-get-tar-commit-id git-apply git-stripspace git-cvs2git \
+       git-get-tar-commit-id git-apply git-stripspace \
 -      git-diff-stages git-rev-parse git-patch-id \
 -      git-pack-objects git-unpack-objects
 +      git-diff-stages git-rev-parse git-patch-id git-pack-objects \
 +      git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
 +      git-prune-packed git-fetch-pack git-upload-pack
  
  all: $(PROG)