[SCM] GNU Mach branch, master-xen, updated. 374ba7bff4ec9d4fb574abce27103c89fa772c3a

[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  374ba7bff4ec9d4fb574abce27103c89fa772c3a (commit)
       via  155d3ff9361676190ff4483b37a2f7048625cd1e (commit)
       via  0e415b4ae44d610eafe484f6b9302b08a448accb (commit)
       via  40f8b441bb161cd09ff8210944e18995b2d2019f (commit)
       via  296a9380f5dde4514890d1409bd140db91f60adb (commit)
       via  11a8f8032a7ea0a926711894815650c05c660de1 (commit)
       via  0ae79e6cd9d4ab5d70ae399850bb804991b92c94 (commit)
       via  2cd448b2a65df4d81950f9d5bd2389add9d1b8da (commit)
       via  f0d2abf1a3aa06e6b53dba642d09fd9237624107 (commit)
       via  04152ecb45319bdfca49592cc1c88dc7f5a3ac5f (commit)
       via  8fdd03d725c84795ee646ff90e4b8e90bdab00f3 (commit)
       via  55dbc2b5d857d35262ad3116803dfb31b733d031 (commit)
      from  48700ab6955213564ba77b3908404236e3d87ede (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 374ba7bff4ec9d4fb574abce27103c89fa772c3a
Merge: 48700ab6955213564ba77b3908404236e3d87ede 
155d3ff9361676190ff4483b37a2f7048625cd1e
Author: Samuel Thibault <address@hidden>
Date:   Sat Dec 19 19:45:42 2009 +0100

    Merge branch 'master' into master-xen
    
    Conflicts:
        linux/dev/include/asm-i386/segment.h

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

Summary of changes:
 i386/i386/pcb.c                      |    1 +
 i386/i386at/com.c                    |   12 +-
 i386/i386at/kd_mouse.c               |    4 +-
 i386/i386at/lpr.c                    |   10 +-
 i386/intel/pmap.c                    |    7 +-
 i386/intel/pmap.h                    |    6 +
 linux/dev/arch/i386/kernel/irq.c     |   14 +-
 linux/dev/include/asm-i386/segment.h |  380 ----------------------------------
 linux/src/arch/i386/kernel/bios32.c  |   20 +-
 linux/src/drivers/net/apricot.c      |   16 +-
 linux/src/drivers/scsi/aha1542.c     |    8 +-
 linux/src/include/asm-i386/segment.h |  109 +++++++----
 vm/vm_resident.c                     |    4 +-
 13 files changed, 127 insertions(+), 464 deletions(-)
 delete mode 100644 linux/dev/include/asm-i386/segment.h


hooks/post-receive
-- 
GNU Mach