]> git.hungrycats.org Git - linux/commitdiff
Merge master.kernel.org:/home/mochel/BK/linux-2.5-linus
authorPatrick Mochel <mochel@geena.pdx.osdl.net>
Tue, 28 May 2002 05:00:25 +0000 (22:00 -0700)
committerPatrick Mochel <mochel@hera.kernel.org>
Tue, 28 May 2002 05:00:25 +0000 (22:00 -0700)
into geena.pdx.osdl.net:/home/mochel/src/kernel/devel/linux-2.5-linus

1  2 
Makefile

diff --cc Makefile
Simple merge