[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 01/01: Merge branch 'dde-upstream' into eth
From: |
Samuel Thibault |
Subject: |
[hurd] 01/01: Merge branch 'dde-upstream' into eth |
Date: |
Tue, 27 May 2014 08:32:05 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch eth
in repository hurd.
commit 333163c9d28070d6a77f3c2f307c4e3fe0b72a38
Merge: 615c5dd 7f581f1
Author: Samuel Thibault <address@hidden>
Date: Sun May 25 15:00:23 2014 +0000
Merge branch 'dde-upstream' into eth
Conflicts:
boot-proxy-exc/Makefile
devnode/Makefile
devnode/devnode.c
libmachdev/Makefile
libmachdev/block.c
libmachdev/device.defs
libmachdev/ds_routines.c
libmachdev/ds_routines.h
libmachdev/net.c
libmachdev/trivfs_server.c
proc_proxy/Makefile
eth-filter.multi-thread/Makefile | 1 -
eth-filter/Makefile | 7 +--
eth-filter/filter.c | 99 +++++++++++++++++-----------------------
eth-filter/mig-decls.h | 45 ++++++++++++++++++
eth-filter/mig-mutate.h | 32 +++++++++++++
eth-multiplexer/Makefile | 8 +---
eth-multiplexer/device_impl.c | 59 ++++++------------------
eth-multiplexer/mig-decls.h | 45 ++++++++++++++++++
eth-multiplexer/mig-mutate.h | 32 +++++++++++++
eth-multiplexer/multiplexer.c | 24 ++++++----
eth-multiplexer/notify_impl.c | 14 +++---
11 files changed, 234 insertions(+), 132 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git