Merge
authorLinus Torvalds <torvalds@home.transmeta.com>
Fri, 24 May 2002 04:56:37 +0000 (21:56 -0700)
committerLinus Torvalds <torvalds@home.transmeta.com>
Fri, 24 May 2002 04:56:37 +0000 (21:56 -0700)
commitd9a704eee39f8813ce1e22b82ea612076beb7151
tree272ed6b5936c298436926023b85205bfdfd0f5fc
parent71363c48c84ae02ff000fb25fc9cd3d297caf32a
parentce922a4c58c8e7a1b5990a0575fe7bdf24d694a3
Merge
drivers/ide/ide-disk.c
fs/reiserfs/journal.c
kernel/suspend.c