[SCM] GNU Mach branch, master-user_level_drivers, updated. 6a24e0dcc668e4159e5b406ef3cb70981f1d2fcb

[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-user_level_drivers has been updated
       via  6a24e0dcc668e4159e5b406ef3cb70981f1d2fcb (commit)
       via  a8d8bf8488fc7a04523f3c92834a60672098ceca (commit)
       via  0f85d17807072e7c606319e35f00f60dbdc1cfc6 (commit)
       via  faa99cfbe3dbac26021df620a19c3f671a0a2613 (commit)
       via  660d90c5e0a60902e9ec94ea585c50c55a25c10c (commit)
       via  878aa97a21d7a5074cbf87bac6950b8b2b3b2c47 (commit)
       via  e5882d5fb37e689b6ad934ce1a890ecb71f671bb (commit)
       via  dad50b78b6a7507c460dc349acfbda78e91b3ee3 (commit)
       via  e6a0432b5b92b507970e3a6d2302c94a3a389519 (commit)
       via  91e3fde091fb809ea9e14c5b7a752ad5270471b6 (commit)
       via  ae34e897a3dc935b2c5995b573acb254224c065c (commit)
       via  282889dddc41a6f47100d34cf8518775ca46c98f (commit)
       via  039176372b4271f370ef38eb2ee5d43923a5b28b (commit)
       via  6d457cc14e57816aedcb8a7e7ea04b0dbeec0ec6 (commit)
       via  38a058ad3e5b0ff21fa6d12ce9d29af70a0db826 (commit)
      from  8e710fb7b8f4fefe53e62dcd8b66b83a7885823d (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 6a24e0dcc668e4159e5b406ef3cb70981f1d2fcb
Merge: 8e710fb a8d8bf8
Author: Samuel Thibault <address@hidden>
Date:   Sun Sep 19 22:47:44 2010 +0200

    Merge branch 'master' into master-user_level_drivers
    
    Conflicts:
        linux/src/drivers/block/triton.c

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

Summary of changes:
 Makefile.am                      |    3 +-
 Makefrag.am                      |   11 +++-
 i386/Makefrag.am                 |   13 ++++-
 i386/i386/gdt.c                  |    4 ++
 i386/i386/idt_inittab.S          |    4 ++
 i386/i386/trap.c                 |   16 ++++++
 i386/i386at/boothdr.S            |   17 ++++++
 i386/ldscript                    |  104 +++++++++++++++++++------------------
 i386/xen/xen_boothdr.S           |   17 ++++++
 linux/Makefrag.am                |    3 +-
 linux/dev/glue/block.c           |   21 +++++++-
 linux/dev/glue/kmem.c            |    5 +-
 linux/src/drivers/block/ide.c    |    6 ++-
 linux/src/drivers/block/triton.c |    7 +++
 linux/src/drivers/pci/pci.c      |    4 +-
 xen/Makefrag.am                  |   53 +++++++++++++++++++-
 16 files changed, 221 insertions(+), 67 deletions(-)


hooks/post-receive
-- 
GNU Mach