| commit | a862b5c8cd5d847779a049a5fc8cf5b1e6f5fa07 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jun 04 13:31:39 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jun 04 13:31:39 2007 -0700 |
| tree | f64592cf9b60b3687eaabb44ffd986c54148e8f9 | |
| parent | 0b662c64840fb281e5948ab6f9d60f84817277d0 [diff] | |
| parent | 3a2430708fb8f31c084503cb47240483ec2c2662 [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] JAZZ ESP and SUN ESP need SPI_ATTRS [SCSI] atari_NCR5380: update_timeout removal [SCSI] aacraid: fix shutdown handler to also disable interrupts. [SCSI] qla2xxx: fix timeout in qla2x00_down_timeout [SCSI] fix CONFIG_SCSI_WAIT_SCAN=m