diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:19:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:19:18 -0700 |
commit | f1b134fdf6d36c975b4a66cf952565cd73aebdba (patch) | |
tree | f7524266c501c9196106cd14222ab5e8c4f3004f /block/blk-merge.c | |
parent | 7274264f60cc0b71389efed286001ff0860c3141 (diff) | |
parent | e8bac9e0647dd04c83fd0bfe7cdfe2f6dfb100d0 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] scsi_transport_spi: fix oops in revalidate
[SCSI] ses: fix VPD inquiry overrun
[SCSI] block: Fix miscalculation of sg_io timeout in CDROM_SEND_PACKET handler.
[SCSI] hptiop: add more PCI device IDs
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions