[SCM] GNU Mach branch, master-xen, updated. 2f36cd1814dbd6f3247d0f2bc2a74659d0290295

[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  2f36cd1814dbd6f3247d0f2bc2a74659d0290295 (commit)
       via  909c941dc0a2f55828855ee58f9022ffdbbd0b79 (commit)
       via  43ef1428d191e6872ed6f66c976329d5d00741fc (commit)
       via  e87eb2a97594f692fe249d3ad30911deb0bc61c5 (commit)
       via  e227045b06d62ee7d2fbab9d5ade9030ff43170b (commit)
      from  12ecb8402089bba523399e99917c16e865eeb12a (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 2f36cd1814dbd6f3247d0f2bc2a74659d0290295
Merge: 12ecb8402089bba523399e99917c16e865eeb12a 
909c941dc0a2f55828855ee58f9022ffdbbd0b79
Author: Samuel Thibault <address@hidden>
Date:   Wed Oct 14 00:17:47 2009 +0200

    Merge branch 'master' into master-xen
    
    Conflicts:
        ChangeLog
        i386/intel/pmap.c

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

Summary of changes:
 i386/i386/proc_reg.h                    |   11 ++++++++++-
 i386/i386at/model_dep.c                 |   10 +++++++---
 i386/intel/pmap.c                       |   11 +++++++----
 i386/linux/dev/include/linux/autoconf.h |    4 ++--
 4 files changed, 26 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Mach