]> git.neil.brown.name Git - history.git/commitdiff
Merge bk://linuxvm.bkbits.net/linus-2.5 into cantab.net:/usr/src/tng
authorAnton Altaparmakov <aia21@cantab.net>
Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Sat, 27 Apr 2002 13:09:01 +0000 (14:09 +0100)
1  2 
include/linux/fs.h
kernel/ksyms.c

Simple merge
diff --cc kernel/ksyms.c
Simple merge