From: Junio C Hamano Date: Mon, 6 Aug 2012 22:40:00 +0000 (-0700) Subject: Merge branch 'jn/block-sha1' into maint X-Git-Tag: v1.7.12-rc2~2^2~1 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=c8dacba762e1c672b9592e0d1e8dca722422f325 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 --- c8dacba762e1c672b9592e0d1e8dca722422f325