[SCM] GNU Mach branch, master-xen, updated. 34cc95d92cce35cb14974d6e393dc1249228ee0d

[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-xen has been updated
       via  34cc95d92cce35cb14974d6e393dc1249228ee0d (commit)
       via  d088a062c1dcbd5047a6bf41ccb2cb1da2c78060 (commit)
       via  43347f8e5f17cf246d2199b4db5b899e8bb08557 (commit)
       via  6a47810d44ab7f1f0c2c93229797bf7c2f232ff7 (commit)
      from  14cff7af438ad937df2c7b7cd597a2ead760389f (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 34cc95d92cce35cb14974d6e393dc1249228ee0d
Merge: 14cff7af438ad937df2c7b7cd597a2ead760389f 
d088a062c1dcbd5047a6bf41ccb2cb1da2c78060
Author: Samuel Thibault <address@hidden>
Date:   Sat Nov 28 17:38:38 2009 +0100

    Merge branch 'master' into master-xen
    
    Conflicts:
        kern/debug.c

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

Summary of changes:
 Makefrag.am                       |    1 +
 i386/i386at/model_dep.c           |    9 +
 i386/include/mach/i386/vm_types.h |    1 +
 include/mach/mach4.defs           |   30 +
 include/mach/memory_object.h      |    3 +
 kern/debug.c                      |    6 +-
 kern/ipc_kobject.c                |    3 +
 kern/ipc_kobject.h                |    5 +-
 linux/Makefrag.am                 |    5 +
 linux/configfrag.ac               |    4 +
 linux/dev/drivers/net/Space.c     |    4 +
 linux/src/drivers/net/sis900.c    | 1803 +++++++++++++++++++++++++++++++++++++
 linux/src/drivers/net/sis900.h    |  284 ++++++
 vm/vm_init.c                      |    1 +
 vm/vm_user.c                      |   23 +-
 15 files changed, 2178 insertions(+), 4 deletions(-)
 create mode 100644 linux/src/drivers/net/sis900.c
 create mode 100644 linux/src/drivers/net/sis900.h


hooks/post-receive
-- 
GNU Mach