]> git.neil.brown.name Git - history.git/commitdiff
Merge master.kernel.org:/home/mingo/BK/linux-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Mon, 11 Feb 2002 13:01:48 +0000 (05:01 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Mon, 11 Feb 2002 13:01:48 +0000 (05:01 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
kernel/ksyms.c

diff --cc kernel/ksyms.c
Simple merge