[hurd] 61/61: Merge remote-tracking branch 'upstream/master' 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 55dd7de994d9bc93e6c6ba56d00804a88a5ccc13
Merge: 7ba3321 1d1da90
Author: Samuel Thibault <address@hidden>
Date:   Mon May 26 18:54:36 2014 +0000

    Merge remote-tracking branch 'upstream/master' into upstream

 console-client/xkb/xkb.c                |  3 ++-
 exec/exec.c                             |  1 +
 exec/main.c                             |  1 +
 ext2fs/pager.c                          |  2 +-
 include/Makefile                        |  2 +-
 libdiskfs/diskfs.h                      |  7 ++++---
 libdiskfs/name-cache.c                  |  3 ++-
 libdiskfs/peropen-make.c                |  2 +-
 libdiskfs/peropen-rele.c                | 21 ++++++++++-----------
 libdiskfs/protid-make.c                 |  8 ++++----
 libihash/ihash.c                        | 22 ++++------------------
 libpager/priv.h                         |  2 --
 libpipe/pipe.c                          |  4 +++-
 libtrivfs/cntl-create.c                 |  1 -
 libtrivfs/io-reauthenticate.c           |  5 +----
 libtrivfs/io-restrict-auth.c            |  4 +---
 libtrivfs/open.c                        |  2 +-
 libtrivfs/protid-clean.c                | 29 ++++++++++++++++++-----------
 libtrivfs/protid-dup.c                  |  5 +----
 libtrivfs/trivfs.h                      |  4 ++--
 mach-defpager/default_pager.c           |  4 ++--
 pfinet/linux-src/include/net/addrconf.h |  2 ++
 pfinet/linux-src/net/ipv4/fib_hash.c    |  2 +-
 pflocal/connq.c                         |  2 +-
 pflocal/socket.c                        |  4 +++-
 term/users.c                            |  4 +---
 trans/mtab.c                            |  2 +-
 27 files changed, 69 insertions(+), 79 deletions(-)

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