Merge branch 'master' into net-dev
authorKevin Klues <klueska@eecs.berkeley.edu>
Sat, 1 Aug 2009 18:41:47 +0000 (11:41 -0700)
committerKevin Klues <klueska@eecs.berkeley.edu>
Sat, 1 Aug 2009 18:41:47 +0000 (11:41 -0700)
commitce74a332b87eaa71091fa01ee33bf66e9234b613
tree1938878ea29c73e2ed34a236e58233e70484f122
parent6e0544d8827dfb21fcd7cb4ba6fbb6b1bd6767f8
parent4f67635529064b691c1ac92bde27e2494dfe700d
Merge branch 'master' into net-dev

Conflicts:
.gitignore
kern/boot
kern/include/ros/syscall.h
kern/src/Makefrag
kern/src/init.c
kern/src/smp.c
kern/src/syscall.c
kern/src/testing.c
user/parlib/inc/parlib.h
user/parlib/src/newlib_backend.c
user/parlib/src/syscall.c
21 files changed:
kern/arch/i386/apic.c
kern/arch/i386/apic.h
kern/arch/i386/ioapic.h
kern/arch/i386/trap.c
kern/include/mptables.h
kern/include/pci.h
kern/include/rl8168.h
kern/include/ros/syscall.h
kern/include/testing.h
kern/src/Makefrag
kern/src/env.c
kern/src/init.c
kern/src/ioapic.c
kern/src/monitor.c
kern/src/smp.c
kern/src/syscall.c
kern/src/testing.c
user/apps/parlib/Makefrag
user/parlib/inc/parlib.h
user/parlib/src/newlib_backend.c
user/parlib/src/syscall.c