Merge branch 'jn/block-sha1' into maint
commitc8dacba762e1c672b9592e0d1e8dca722422f325
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:40:00 +0000 (6 15:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2012 22:40:00 +0000 (6 15:40 -0700)
tree6f829d4a6079498612df8db20582e07a58965d05
parentdbf64e125a96cd9e6de401361613e8dc888c65ee
parentf200197c39d9181c02cac06c26433edaa9d31219
Merge branch 'jn/block-sha1' into maint

* jn/block-sha1:
  Makefile: BLK_SHA1 does not require fast htonl() and unaligned loads
  block-sha1: put expanded macro parameters in parentheses
  block-sha1: avoid pointer conversion that violates alignment constraints
Makefile
block-sha1/sha1.c