Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 7 Dec 2006 21:35:17 +0000 (16:35 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 7 Dec 2006 21:35:17 +0000 (16:35 -0500)
commit21b4e736922f546e0f1aa7b9d6c442f309a2444a
treee1be8645297f8ebe87445251743ebcc52081a20d
parent34161db6b14d984fb9b06c735b7b42f8803f6851
parent68380b581383c028830f79ec2670f4a193854aa6
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
fs/lockd/clntproc.c
fs/nfs/direct.c
fs/nfs/inode.c
fs/nfs/pagelist.c
fs/nfs/read.c
fs/nfs/write.c
include/linux/sunrpc/sched.h
net/sunrpc/sched.c
net/sunrpc/xprtsock.c