]> git.neil.brown.name Git - history.git/commitdiff
Merge
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 24 May 2002 04:17:23 +0000 (21:17 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 24 May 2002 04:17:23 +0000 (21:17 -0700)
1  2 
drivers/ide/ide-disk.c

Simple merge