[SCM] GNU Mach branch, master-x86_64, updated. 0a2b68a22b269315933cf29dcbef398e66315489

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mach".

The branch, master-x86_64 has been updated
       via  0a2b68a22b269315933cf29dcbef398e66315489 (commit)
       via  71f231da83fdd75deab3ce1b8643da50b6f574f5 (commit)
       via  c74adfecd0b21ea84f7e98629549f7489c78edc9 (commit)
       via  0ef8bca36fdf3c57c90c948a4894c4baf5e0c3fd (commit)
       via  2ec0334d36910ff59727f1c6b3efc6648209020a (commit)
       via  264b750cc2d576beadfd74bcde45ac75edc4aab9 (commit)
       via  7effecf87173a122c95427dafa971abbbdba3493 (commit)
       via  6ea0920c4c99f53f6c4d784285c5aa00ba9a5b2f (commit)
       via  d87d897ae7890ed7a58ec65c0c60a2258747e3c1 (commit)
       via  809f7720aa0c1704e821ce31b147765c9676f0e6 (commit)
      from  7738b2ed843b72f61a464f96a617abe46698d03c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0a2b68a22b269315933cf29dcbef398e66315489
Merge: 7738b2e 71f231d
Author: Samuel Thibault <address@hidden>
Date:   Sat Mar 24 03:22:51 2012 +0100

    Merge branch 'master' into master-x86_64
    
    Conflicts:
        i386/i386/vm_param.h

-----------------------------------------------------------------------

Summary of changes:
 i386/Makefrag.am                    |    1 +
 i386/i386/i386asm.sym               |    2 +-
 i386/i386/vm_param.h                |    4 +++
 i386/i386at/boothdr.S               |   37 ++++++++++++++++++++++++++++
 i386/i386at/model_dep.c             |   46 +++++++++++++++++++++++-----------
 i386/intel/pmap.c                   |   14 +++++++---
 i386/ldscript                       |    1 +
 i386/xen/Makefrag.am                |    1 +
 linux/dev/glue/block.c              |    8 +++---
 linux/dev/glue/misc.c               |    2 +
 linux/dev/glue/net.c                |    7 +++--
 linux/dev/include/asm-i386/page.h   |    7 +----
 linux/dev/init/main.c               |    4 +-
 linux/src/drivers/scsi/ncr53c8xx.c  |    2 +-
 linux/src/include/asm-i386/io.h     |    6 +++-
 linux/src/include/linux/compatmac.h |    5 ++-
 16 files changed, 107 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
GNU Mach