]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit669d16fadce9263a8632502b3a430b716e66b4ca
treee1be8645297f8ebe87445251743ebcc52081a20d
parent5cb0c2d71b959c618130ff244b2ec8f96321d3a5
parentb1357d4fd4a678f6c0b0d6aba301b36a2c98ce59
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