]> git.hungrycats.org Git - linux/commitdiff
Merge bk://lsm.bkbits.net/linus-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 20 Dec 2002 14:46:47 +0000 (06:46 -0800)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 20 Dec 2002 14:46:47 +0000 (06:46 -0800)
into home.transmeta.com:/home/torvalds/v2.5/linux


Trivial merge