diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/aacraid/comminit.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/aacraid/comminit.c')
| -rw-r--r-- | drivers/scsi/aacraid/comminit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index d598eba630d0..666d5151d628 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c | |||
| @@ -226,7 +226,7 @@ static int aac_comm_init(struct aac_dev * dev) | |||
| 226 | spin_lock_init(&dev->fib_lock); | 226 | spin_lock_init(&dev->fib_lock); |
| 227 | 227 | ||
| 228 | /* | 228 | /* |
| 229 | * Allocate the physically contigous space for the commuication | 229 | * Allocate the physically contiguous space for the commuication |
| 230 | * queue headers. | 230 | * queue headers. |
| 231 | */ | 231 | */ |
| 232 | 232 | ||