Merge branch 'master' into next
James Morris [Mon, 8 Jun 2009 23:27:53 +0000 (09:27 +1000)]
1  2 
Documentation/kernel-parameters.txt
fs/nfsd/vfs.c
fs/proc/base.c
kernel/ptrace.c

Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
diff --cc fs/proc/base.c
Simple merge
diff --cc kernel/ptrace.c
Simple merge