]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bda2dab 1e799f7)
Merge bk://lsm@bkbits.net/linus-2.5
authorGreg Kroah-Hartman <greg@kroah.com>
Sat, 15 Mar 2003 12:55:59 +0000 (04:55 -0800)
committerGreg Kroah-Hartman <greg@kroah.com>
Sat, 15 Mar 2003 12:55:59 +0000 (04:55 -0800)
into kroah.com:/home/linux/linux/BK/lsm-2.5

1  2 
fs/nfsd/vfs.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/vfs.c
Simple merge
Linux kernels and configurations used by Zygo.