]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e89e896 f839c4c)
Merge branch 'bkl-removal' into next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:58 +0000 (18:34 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 15 Jul 2008 22:34:58 +0000 (18:34 -0400)
1  2 
fs/nfs/file.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/file.c
Simple merge
Linux 2.6 source tree