Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 18 Oct 2005 20:50:52 +0000 (13:50 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 18 Oct 2005 20:50:52 +0000 (13:50 -0700)
commitcff6bf970965c98c62007fc8a36527fd147fe233
tree2791f2208b54ade86625af416ff5342f11282f0c
parent6cd7525a00f3b926e8bd2e402954ed3e09a8e924
parent39ca371c45b04cd50d0974030ae051906fc516b6
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
fs/nfs/inode.c