]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cd7525 39ca371)
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)
1  2 
fs/nfs/inode.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/inode.c
Simple merge
Linux kernel for KaRo TX COM modules