]> git.hungrycats.org Git - linux/commitdiff
Merge cantab.net:/usr/src/bklinux-2.5 into cantab.net:/usr/src/ntfs-2.5
authorAnton Altaparmakov <aia21@cantab.net>
Thu, 29 Aug 2002 23:40:25 +0000 (00:40 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Thu, 29 Aug 2002 23:40:25 +0000 (00:40 +0100)
1  2 
arch/i386/defconfig
arch/sparc64/defconfig

Simple merge
Simple merge