cleaning up after merge
authorMarc Fiuczynski <mef@cs.princeton.edu>
Mon, 13 Nov 2006 17:47:16 +0000 (17:47 +0000)
committerMarc Fiuczynski <mef@cs.princeton.edu>
Mon, 13 Nov 2006 17:47:16 +0000 (17:47 +0000)
commitc98d03330787f1dc06830afdd53eed75228d76b6
tree9698131a5e53056e28f4cff83705407dc4fbb8f3
parent3f4684d46045ba79047cd55f24576a2742109442
cleaning up after merge
Makefile
fs/proc/base.c
fs/proc/proc_misc.c
include/linux/vs_cvirt.h
kernel/timer.c
kernel/vserver/sched.c
mm/oom_kill.c
scripts/kernel-2.6-planetlab.spec