Commit 7bfe7426 authored by Linus Torvalds's avatar Linus Torvalds

Manual merge for problems between Al Viro's blocksize removal and

Douglas Gilbert's SCSI cleanups
parents 7831a09f 0e46579e
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment