Merge branch 'master' into next
commit0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f
authorJames Morris <jmorris@namei.org>
Mon, 8 Jun 2009 23:27:53 +0000 (9 09:27 +1000)
committerJames Morris <jmorris@namei.org>
Mon, 8 Jun 2009 23:27:53 +0000 (9 09:27 +1000)
tree1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed
parent04288f42033607099cebf5ca15ce8dcec3a9688b
parent3af968e066d593bc4dacc021715f3e95ddf0996f
Merge branch 'master' into next
Documentation/kernel-parameters.txt
fs/nfsd/vfs.c
fs/proc/base.c
kernel/ptrace.c