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)
commit134133793eb9cac88652c41da00faa460b90df74
tree6c20038c73d9c9288b71062fdc044ba3df33aa71
parent6177c8bb7d854b5b21b3fcd1713f41b5f7fd9088
parentac5bdbb7cf6c7520a3a425aa37ff18dcc7bef51b
Merge
drivers/ide/ide-disk.c