]> git.hungrycats.org Git - linux/commitdiff
projects / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77a32d7 dbd8220)
Merge home.transmeta.com:/home/torvalds/v2.5/coda
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 11 Oct 2002 13:05:04 +0000 (06:05 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 11 Oct 2002 13:05:04 +0000 (06:05 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
fs/coda/inode.c patch | diff1 | diff2 | blob | history
include/linux/coda_psdev.h patch | diff1 | diff2 | blob | history

diff --cc fs/coda/inode.c
Simple merge
diff --cc include/linux/coda_psdev.h
Simple merge
Linux kernels and configurations used by Zygo.