[hurd] 02/11: Merge branch 'upstream-merged'

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository hurd.

commit d5c226f2c2e25cec4403331e7b03ed8956e363cd
Merge: 82f6ffd 1c963df
Author: Samuel Thibault <address@hidden>
Date:   Mon Jan 2 17:37:19 2017 +0000

    Merge branch 'upstream-merged'

 hurd/hurd_types.h             |  3 ++
 hurd/paths.h                  |  1 +
 libnetfs/netfs.h              |  2 ++
 libps/spec.c                  |  2 +-
 mach-defpager/default_pager.c | 34 +++++++++++++---------
 mach-defpager/kalloc.c        |  2 --
 mach-defpager/wiring.c        | 67 +++++++++----------------------------------
 mach-defpager/wiring.h        |  1 -
 procfs/main.c                 | 24 ----------------
 procfs/main.h                 |  1 -
 procfs/rootdir.c              | 23 +++------------
 11 files changed, 44 insertions(+), 116 deletions(-)

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