diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:31:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-04 16:31:39 -0400 |
| commit | a862b5c8cd5d847779a049a5fc8cf5b1e6f5fa07 (patch) | |
| tree | f64592cf9b60b3687eaabb44ffd986c54148e8f9 /Documentation/networking/xfrm_sysctl.txt | |
| 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
Diffstat (limited to 'Documentation/networking/xfrm_sysctl.txt')
0 files changed, 0 insertions, 0 deletions