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

[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  0c9395c4ada9811852b73c36179f1ec4293e5b5c (commit)
       via  f02f83ee31f671484438caa6493c3225ee3b297b (commit)
       via  ebd25e44eedf683551f0914137ff0f4f0a1a1858 (commit)
       via  ea5d3cf263142034d2edbcbf6655d55b215a9edc (commit)
       via  9c923006bddc1bcbeadec99aa92a0214f6d6dcfd (commit)
       via  eadebc1e6d1f206500f7afd9531c18ba36dae17e (commit)
      from  0a62f7b724fe2a660da9885ad761bbe799eb2932 (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 0c9395c4ada9811852b73c36179f1ec4293e5b5c
Author: Samuel Thibault <address@hidden>
Date:   Sun Mar 18 20:51:58 2012 +0100

    Drop spurious changes

commit f02f83ee31f671484438caa6493c3225ee3b297b
Merge: 0a62f7b ebd25e4
Author: Samuel Thibault <address@hidden>
Date:   Sun Mar 18 20:50:22 2012 +0100

    Merge branch 'master' into master-x86_64
    
    Conflicts:
        i386/i386/i386asm.sym

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

Summary of changes:
 i386/i386/i386asm.sym           |    2 +-
 i386/intel/pmap.c               |    1 -
 i386/intel/pmap.h               |    7 -------
 kern/startup.c                  |    1 -
 linux/src/arch/i386/lib/delay.c |    3 +--
 5 files changed, 2 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU Mach