]> git.neil.brown.name Git - history.git/commitdiff
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
authorPatrick Mochel <mochel@osdl.org>
Fri, 5 Sep 2003 07:17:55 +0000 (00:17 -0700)
committerPatrick Mochel <mochel@osdl.org>
Fri, 5 Sep 2003 07:17:55 +0000 (00:17 -0700)
into osdl.org:/home/mochel/src/kernel/linux-2.5-core

1  2 
fs/sysfs/inode.c

Simple merge