diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 06:57:05 +0200 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 06:57:05 +0200 |
commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
tree | 8291998abd73055de6f487fafa174ee2a5d3afee /Documentation/RCU/torture.txt | |
parent | [SCSI] 3w-xxxx: convert to use the data buffer accessors (diff) | |
parent | a bug in ramfs_nommu_resize function, passing old size to vmtruncate (diff) | |
download | linux-5bc65793cbf8da0d35f19ef025dda22887e79e80.tar.xz linux-5bc65793cbf8da0d35f19ef025dda22887e79e80.zip |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'Documentation/RCU/torture.txt')
0 files changed, 0 insertions, 0 deletions