]> 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, 20 Nov 2002 06:15:08 +0000 (00:15 -0600)
committerPatrick Mochel <mochel@osdl.org>
Wed, 20 Nov 2002 06:15:08 +0000 (00:15 -0600)
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-kobject

1  2 
fs/sysfs/inode.c

Simple merge