[gnumach] 03/03: Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository gnumach.

commit 472b5cea42869d2364aaf4fe19f1fa3a1d0c3e48
Merge: 1a66e8c aea22d8
Author: Samuel Thibault <address@hidden>
Date:   Thu Mar 20 02:26:30 2014 +0000

    Merge branch 'master' of git.debian.org:/git/pkg-hurd/gnumach
    
    Conflicts:
        debian/changelog
        debian/patches/series

 debian/changelog                         |   8 +-
 debian/control                           |   3 +-
 debian/patches/git-physical-access.patch | 241 +++++++++++++++++++++++++++++++
 debian/patches/series                    |   1 +
 4 files changed, 250 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index a802093,0f7598a..e8e068e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,17 @@@
 -gnumach (2:1.4-7) UNRELEASED; urgency=medium
 +gnumach (2:1.4-7) unstable; urgency=medium
  
+   [ Samuel Thibault ]
+   * patches/git-physical-access.patch: New patch, fixes access to physical
+     pages beyond last_phys_addr.
 +  * patches/git-task_set_name.patch: New patch from git to add task_set_name
 +    RPC.
 +  * patches/90-fix_headers.patch: New patch to fix gnumach.defs build.
 +  * rules: Remove generated doc files.
  
-  -- Samuel Thibault <address@hidden>  Wed, 19 Mar 2014 19:08:30 +0000
+   [ Guillem Jover ]
+   * Remove myself from Uploaders.
+ 
 - -- Samuel Thibault <address@hidden>  Mon, 03 Mar 2014 00:59:30 +0100
++ -- Samuel Thibault <address@hidden>  Thu, 20 Mar 2014 02:26:40 +0000
  
  gnumach (2:1.4-6) unstable; urgency=medium
  
diff --cc debian/patches/series
index 09936fd,bcb1755..2176a9b
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -11,5 -11,4 +11,6 @@@ git-cursor_init.patc
  git-coverity-fixes.patch
  git-mig-inlines.patch
  git-quiet-cd-floppy.patch
 +git-task_set_name.patch
+ git-physical-access.patch
 +90-fix_headers.patch

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