[hurd] 05/07: Merge branch 'upstream-merged'

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit c55dd5d6458bc6720a56deb0dce341e52f8557e9
Merge: 76db71d ba0a622
Author: Samuel Thibault <address@hidden>
Date:   Sun Sep 10 23:33:14 2017 +0000

    Merge branch 'upstream-merged'

 .../contrib/include/linux/compiler-gcc7.h          | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git