[hurd] 01/04: 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 b0adb1222e06628438415757f24e4d8da1bde94d
Merge: 9e4f126 95bd1b9
Author: Samuel Thibault <address@hidden>
Date:   Fri Nov 1 22:39:37 2013 +0000

    Merge branch 'upstream-merged'

 configure.ac                |    2 +-
 console-client/console.c    |   11 +++--
 console-client/input.h      |    2 +-
 console/display.c           |    5 ++-
 console/hurd.ti             |    6 +--
 daemons/rc.sh               |    9 +++-
 exec/Makefile               |    3 --
 exec/hashexec.c             |    1 +
 exec/hostarch.c             |   99 +------------------------------------------
 exec/main.c                 |   19 ---------
 libdiskfs/file-set-size.c   |    2 +-
 libdiskfs/ifsock.c          |    2 +-
 libdiskfs/node-nput.c       |    6 +++
 libfshelp/translator-list.c |    5 ++-
 libnetfs/dir-lookup.c       |    4 +-
 libnetfs/file-set-size.c    |    2 +
 libports/create-internal.c  |    9 ++--
 libshouldbeinlibc/maptime.c |    2 +
 libtreefs/s-file.c          |    2 +
 libtrivfs/protid-clean.c    |   13 +++---
 pflocal/sock.c              |    6 ++-
 pflocal/socket.c            |    5 +--
 procfs/rootdir.c            |   55 ++++++++++++++++++------
 storeio/io.c                |    2 +
 term/ptyio.c                |    6 +++
 term/users.c                |    2 +
 tmpfs/tmpfs.c               |    6 ---
 trans/mtab.c                |   16 +++----
 trans/null.c                |    2 +
 trans/streamio.c            |    2 +
 30 files changed, 126 insertions(+), 180 deletions(-)

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