]> git.hungrycats.org Git - linux/commitdiff
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
authorPatrick Mochel <mochel@osdl.org>
Thu, 25 Sep 2003 01:36:16 +0000 (18:36 -0700)
committerPatrick Mochel <mochel@osdl.org>
Thu, 25 Sep 2003 01:36:16 +0000 (18:36 -0700)
into osdl.org:/home/mochel/src/kernel/linux-2.5-power

1  2 
arch/i386/Kconfig

Simple merge