[hurd] 06/06: Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd into upstream

[Samuel Thibault]

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

sthibault pushed a commit to branch upstream
in repository hurd.

commit a2cfb67d139c4af48efb46a12aa2c5f6681674cb
Merge: 77b1fce 4f51b0e
Author: Samuel Thibault <address@hidden>
Date:   Wed Mar 16 00:56:49 2016 +0000

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd into 
upstream

 ext2fs/pager.c                |   9 +++-
 hurd/default_pager.defs       |   9 ++++
 hurd/default_pager_reply.defs |   2 +
 hurd/default_pager_types.h    |   2 +
 hurd/process_reply.defs       |   2 +
 hurd/process_request.defs     |  10 ++++
 mach-defpager/default_pager.c | 100 +++++++++++++++++++++++++++++++++++++++
 mach-defpager/priv.h          |   1 +
 procfs/Makefile               |   2 +-
 procfs/rootdir.c              |  58 +++++++++++++++++++++++
 sutils/swapon.c               | 107 ++++++++++++++++++++++++++++++------------
 trans/firmlink.c              |   8 ++++
 trans/mtab.c                  |  26 +++++-----
 trans/proxy-defpager.c        |  13 +++++
 14 files changed, 303 insertions(+), 46 deletions(-)

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