[hurd] 06/08: 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 66e693625b444fa98ad23aa1f5a0f4e7f7aba149
Merge: acb878d 8bc09f8
Author: Samuel Thibault <address@hidden>
Date:   Thu Jan 14 00:32:25 2016 +0000

    Merge branch 'upstream-merged'

 eth-multiplexer/Makefile                | 2 +-
 libbpf/Makefile                         | 2 +-
 libddekit/Makefile                      | 2 +-
 libmachdev/Makefile                     | 2 +-
 pfinet/linux-src/include/linux/skbuff.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

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