[SCM] GNU Mach branch, master-x86_64, updated. 7738b2ed843b72f61a464f96a617abe46698d03c

[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  7738b2ed843b72f61a464f96a617abe46698d03c (commit)
       via  10c8b3948462dc2c286e78af6a8a8ad472326467 (commit)
       via  84bf93fa103eb9e2ed914b67cd5d2c7058d30b42 (commit)
       via  0410dd9e3fe657ef3d8334394180eac5956d407d (commit)
       via  3799f797d1c8f440bd83c11db3d76a9fb93b6fdb (commit)
       via  ba54d8a07b20916b84df1d8159fb0b50f8f692b8 (commit)
       via  735cf19fdebf4a3df886426a51cad78b7ef025f2 (commit)
       via  5b6966db94a3f3113f7795d9513c832bd1a43f26 (commit)
       via  45dc1c2a3d8a95ddc8cc115a5e41fa0afbc82208 (commit)
      from  13ab958034b3649a8f4f101c7b0e701f2b66ffca (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 7738b2ed843b72f61a464f96a617abe46698d03c
Author: Samuel Thibault <address@hidden>
Date:   Tue Mar 20 02:48:32 2012 +0100

    r15 is only on x86_64

commit 10c8b3948462dc2c286e78af6a8a8ad472326467
Merge: 13ab958 84bf93f
Author: Samuel Thibault <address@hidden>
Date:   Tue Mar 20 02:47:39 2012 +0100

    Merge branch 'master' into master-x86_64
    
    Conflicts:
        i386/i386/db_interface.c
        i386/i386/db_trace.c
        i386/i386/debug_i386.c
        i386/i386/thread.h
        i386/intel/pmap.c
        i386/intel/pmap.h
        kern/lock.c

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

Summary of changes:
 ddb/db_examine.c           |    2 +-
 i386/i386/db_trace.c       |    2 +-
 i386/i386/debug_i386.c     |    4 ----
 i386/i386/i386asm.sym      |    2 ++
 i386/i386/trap.c           |    8 ++++----
 i386/i386at/com.c          |    4 ++--
 i386/i386at/kd.c           |    4 ++--
 i386/i386at/lpr.c          |    4 ++--
 linux/dev/kernel/softirq.c |    2 +-
 9 files changed, 15 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
GNU Mach