]> git.hungrycats.org Git - linux/commitdiff
Merge bk://linux.bkbits.net/linux-2.5
authorPatrick Mochel <mochel@kernel.bkbits.net>
Wed, 24 Sep 2003 04:54:46 +0000 (21:54 -0700)
committerPatrick Mochel <mochel@kernel.bkbits.net>
Wed, 24 Sep 2003 04:54:46 +0000 (21:54 -0700)
into kernel.bkbits.net:/home/mochel/linux-2.5-power

1  2 
arch/i386/Kconfig
arch/i386/Makefile

Simple merge
Simple merge