[hurd] 09/09: Merge branch 'dde-upstream' into dde

[Samuel Thibault]

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

sthibault pushed a commit to annotated tag upstream/dde/0.5.git20150208
in repository hurd.

commit 4964b2a81c26b5b48ea84dc1e4c6db7608d05ce9
Merge: 723ff43 db74da9
Author: Samuel Thibault <address@hidden>
Date:   Sun Feb 8 23:53:32 2015 +0000

    Merge branch 'dde-upstream' into dde
    
    Conflicts:
        eth-filter/mig-decls.h
        eth-filter/mig-mutate.h
        eth-multiplexer/Makefile
        eth-multiplexer/mig-decls.h
        eth-multiplexer/mig-mutate.h

 devnode/Makefile        | 1 +
 devnode/mig-mutate.h    | 2 ++
 libmachdev/Makefile     | 6 ++++--
 libmachdev/block.c      | 4 ++--
 libmachdev/mig-decls.h  | 6 ++++++
 libmachdev/mig-mutate.h | 4 ++++
 6 files changed, 19 insertions(+), 4 deletions(-)

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