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

[Samuel Thibault]

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

sthibault pushed a commit to branch eth
in repository hurd.

commit 99d5e7be7d25d9476357c6d9282611ecd8ad42a5
Merge: 42c4421 852f723
Author: Samuel Thibault <address@hidden>
Date:   Wed Dec 10 01:12:33 2014 +0000

    Merge branch 'dde-upstream' into eth
    
    Conflicts:
        devnode/devnode.c
        libmachdev/Makefile
        libmachdev/ds_routines.c
        libmachdev/net.c

 eth-filter.multi-thread/filter.c |  21 ---
 eth-filter/filter.c              |  21 ---
 eth-multiplexer/demuxer.c        |  37 +++--
 eth-multiplexer/device.h         | 336 ---------------------------------------
 eth-multiplexer/device_impl.c    |  26 ---
 eth-multiplexer/ethernet.c       |   7 +-
 6 files changed, 26 insertions(+), 422 deletions(-)

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