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/scsi_netlink.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/scsi_netlink.c')
| -rw-r--r-- | drivers/scsi/scsi_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index 723fdecd91bd..0fd6ae6911ad 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
| @@ -613,7 +613,7 @@ EXPORT_SYMBOL_GPL(scsi_nl_send_transport_msg); | |||
| 613 | * @data_buf: pointer to vendor unique data buffer | 613 | * @data_buf: pointer to vendor unique data buffer |
| 614 | * | 614 | * |
| 615 | * Returns: | 615 | * Returns: |
| 616 | * 0 on succesful return | 616 | * 0 on successful return |
| 617 | * otherwise, failing error code | 617 | * otherwise, failing error code |
| 618 | * | 618 | * |
| 619 | * Notes: | 619 | * Notes: |