Merge commit 'origin' into devel
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 8 Mar 2008 16:49:24 +0000 (11:49 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sat, 8 Mar 2008 16:49:24 +0000 (11:49 -0500)
1  2 
fs/nfs/inode.c
fs/nfs/internal.h

diff --cc fs/nfs/inode.c
Simple merge
Simple merge