]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux-ntfs.bkbits.net/ntfs-tng-2.5
authorLinus Torvalds <torvalds@home.transmeta.com>
Sun, 28 Apr 2002 12:10:38 +0000 (05:10 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Sun, 28 Apr 2002 12:10:38 +0000 (05:10 -0700)
into home.transmeta.com:/home/torvalds/v2.5/linux

1  2 
arch/i386/defconfig

Simple merge