diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-14 22:03:50 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-14 22:03:50 +0300 |
| commit | 0f511ea70600efb1e06d7b55e1c51a83aff8713c (patch) | |
| tree | aff23d774e17528c27c57b949c5a60aa5c464dbf /drivers/net/s2io.c | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
| parent | ad58f7dbeb6f5ea82679962f18985f16b660a2d9 (diff) | |
| download | linux-0f511ea70600efb1e06d7b55e1c51a83aff8713c.tar.xz | |
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] zfcp: fix device registration issues
[SCSI] scsi_transport_fc: fix FC_HOST_NUM_ATTRS
[SCSI] scsi: aha152x pcmcia driver needs spi transport
[SCSI] zfcp: correctly set this_id for hosts
[SCSI] Add Brownie to blacklist
Diffstat (limited to 'drivers/net/s2io.c')
0 files changed, 0 insertions, 0 deletions