[hurd] 12/12: 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 723ff433520cdb9e3ce37bf8e8d214e21e2936a8
Merge: 607eaa3 852f723
Author: Samuel Thibault <address@hidden>
Date:   Wed Dec 10 01:12:03 2014 +0000

    Merge branch 'dde-upstream' into dde
    
    Conflicts:
        eth-filter.multi-thread/filter.c
        eth-filter/filter.c
        eth-multiplexer/demuxer.c
        eth-multiplexer/device_impl.c
        eth-multiplexer/ethernet.c

 devnode/devnode.c        | 21 ---------------------
 libmachdev/Makefile      |  3 ---
 libmachdev/ds_routines.c | 45 ---------------------------------------------
 libmachdev/net.c         | 36 +++++++++++++-----------------------
 4 files changed, 13 insertions(+), 92 deletions(-)

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