Merge branch 'jh/memihash-opt'
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:25 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 04:37:25 +0000 (21:37 -0700)
Hotfix for a topic that is already in 'master'.

* jh/memihash-opt:
  p0004: make perf test executable
  t3008: skip lazy-init test on a single-core box
  test-online-cpus: helper to return cpu count
  name-hash: fix buffer overrun

1  2 
Makefile
t/helper/.gitignore

diff --cc Makefile
Simple merge
Simple merge