Merge branch 'master' into proc-work
authorBarret Rhoden <brho@cs.berkeley.edu>
Tue, 4 Aug 2009 00:08:31 +0000 (17:08 -0700)
committerBarret Rhoden <brho@cs.berkeley.edu>
Tue, 4 Aug 2009 00:08:31 +0000 (17:08 -0700)
commitdb157479ed8599075f52e269b484d7f185334362
treeed432c91a8d11814d49686104011af0d5f8d3b28
parentd0dd276b4bf5fc89d735986f94db646f342ec8a2
parent4f67635529064b691c1ac92bde27e2494dfe700d
Merge branch 'master' into proc-work

Conflicts:
kern/arch/i386/trap.c
kern/arch/i386/x86.h
kern/boot
kern/include/env.h
kern/include/monitor.h
kern/include/ros/env.h
kern/include/ros/syscall.h
kern/include/smp.h
kern/src/Makefrag
kern/src/atomic.c
kern/src/env.c
kern/src/init.c
kern/src/manager.c
kern/src/monitor.c
kern/src/pmap.c
kern/src/smp.c
kern/src/syscall.c
kern/src/testing.c
kern/src/workqueue.c
user/parlib/inc/parlib.h
user/parlib/src/syscall.c
44 files changed:
kern/arch/i386/apic.c
kern/arch/i386/apic.h
kern/arch/i386/cpuinfo.c
kern/arch/i386/env.c
kern/arch/i386/kdebug.c
kern/arch/i386/pmap.c
kern/arch/i386/smp.c
kern/arch/i386/smp.h
kern/arch/i386/smp_boot.c
kern/arch/i386/trap.c
kern/include/env.h
kern/include/kfs.h
kern/include/monitor.h
kern/include/pmap.h
kern/include/process.h
kern/include/ros/error.h
kern/include/ros/syscall.h
kern/include/smp.h
kern/include/syscall.h
kern/include/workqueue.h
kern/src/Makefrag
kern/src/env.c
kern/src/init.c
kern/src/kfs.c
kern/src/manager.c
kern/src/monitor.c
kern/src/pmap.c
kern/src/process.c
kern/src/smp.c
kern/src/syscall.c
kern/src/testing.c
kern/src/workqueue.c
user/apps/roslib/measurements.c
user/apps/roslib/proctests.c
user/parlib/inc/channel.h
user/parlib/inc/parlib.h
user/parlib/src/channel.c
user/parlib/src/newlib_backend.c
user/parlib/src/syscall.c
user/roslib/inc/lib.h
user/roslib/inc/measure.h
user/roslib/src/entry_i386.S
user/roslib/src/entry_sparc.S
user/roslib/src/syscall.c