]> git.hungrycats.org Git - linux/commitdiff
Merge cantab.net:/home/aia21/bklinux-2.5
authorAnton Altaparmakov <aia21@cantab.net>
Wed, 24 Sep 2003 11:12:44 +0000 (12:12 +0100)
committerAnton Altaparmakov <aia21@cantab.net>
Wed, 24 Sep 2003 11:12:44 +0000 (12:12 +0100)
into cantab.net:/home/aia21/ntfs-2.6

1  2 
fs/Kconfig

diff --cc fs/Kconfig
Simple merge