]> git.neil.brown.name Git - history.git/commitdiff
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
authorPatrick Mochel <mochel@osdl.org>
Wed, 4 Dec 2002 12:07:19 +0000 (06:07 -0600)
committerPatrick Mochel <mochel@osdl.org>
Wed, 4 Dec 2002 12:07:19 +0000 (06:07 -0600)
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-core

1  2 
drivers/block/genhd.c

Simple merge