Merge branch 'master' into next

* master:
  Makefile: Add TAGS and tags targets
  ls-files: Don't require exclude files to end with a newline.

diff --cc Makefile
Simple merge

diff --cc ls-files.c
Simple merge