diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:58:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:58:05 -0500 |
| commit | 8b4b6707ee32f929846d947d18b1b9bf42e988aa (patch) | |
| tree | aa27dd01e2d74cb68efc4ab57eb4d1f4e563ae33 /drivers/scsi | |
| parent | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 (diff) | |
| parent | 116f232b3794a8b6ebde21aef5004b18cc1cfa86 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
fixed path to moved file in include/linux/device.h
Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description
Documentation/dvb/get_dvb_firmware: fix firmware URL
Documentation: Update to BUG-HUNTING
Remove superfluous NOTIFY_COOKIE_LEN define
add "tags" to .gitignore
Fix "frist", "fisrt", typos
fix rwlock usage example
It's UTF-8
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 38ede24b22a6..39729460b00e 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -902,7 +902,7 @@ static int megasas_reset_bus_host(struct scsi_cmnd *scmd) | |||
| 902 | int ret; | 902 | int ret; |
| 903 | 903 | ||
| 904 | /* | 904 | /* |
| 905 | * Frist wait for all commands to complete | 905 | * First wait for all commands to complete |
| 906 | */ | 906 | */ |
| 907 | ret = megasas_generic_reset(scmd); | 907 | ret = megasas_generic_reset(scmd); |
| 908 | 908 | ||