[hurd] 25/25: 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 branch dde
in repository hurd.

commit 0d80a6004d09880c05602e9b26db94c4b9084495
Merge: deb7a47 7f581f1
Author: Samuel Thibault <address@hidden>
Date:   Sun May 25 14:59:41 2014 +0000

    Merge branch 'dde-upstream' into dde
    
    Conflicts:
        boot-proxy-exc/Makefile
        eth-filter.multi-thread/Makefile
        eth-filter/Makefile
        eth-filter/filter.c
        eth-multiplexer/Makefile
        eth-multiplexer/device_impl.c
        eth-multiplexer/multiplexer.c
        eth-multiplexer/notify_impl.c
        libmachdev/device.defs
        proc_proxy/Makefile

 devnode/Makefile           |   7 +-
 devnode/devnode.c          |  36 ++++---
 devnode/mig-mutate.h       |  25 +++++
 libmachdev/Makefile        |   6 +-
 libmachdev/block.c         |   1 +
 libmachdev/ds_routines.c   | 244 ++++++++++++++-------------------------------
 libmachdev/ds_routines.h   |   2 +
 libmachdev/mig-decls.h     |  44 ++++++++
 libmachdev/mig-mutate.h    |  32 ++++++
 libmachdev/net.c           |  18 ++--
 libmachdev/trivfs_server.c |  34 ++++---
 11 files changed, 232 insertions(+), 217 deletions(-)

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