]> git.hungrycats.org Git - linux/commitdiff
Merge wailua.hpl.hp.com:/bk/vanilla/linux-2.5
authorDavid Mosberger <davidm@wailua.hpl.hp.com>
Tue, 23 Apr 2002 10:39:59 +0000 (03:39 -0700)
committerDavid Mosberger <davidm@wailua.hpl.hp.com>
Tue, 23 Apr 2002 10:39:59 +0000 (03:39 -0700)
into wailua.hpl.hp.com:/bk/lia64/to-linus-2.5

1  2 
arch/ia64/config.in

Simple merge