]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdd0972 84c6f60)
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 patch | diff1 | diff2 | blob | history
fs/nfs/internal.h patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/inode.c
Simple merge
diff --cc fs/nfs/internal.h
Simple merge
Linux 2.6 source tree