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/infiniband/ulp | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/iser/iser_verbs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c index ea9e1556e0d6..8579f32ce38e 100644 --- a/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/drivers/infiniband/ulp/iser/iser_verbs.c | |||
| @@ -499,7 +499,7 @@ void iser_conn_init(struct iser_conn *ib_conn) | |||
| 499 | 499 | ||
| 500 | /** | 500 | /** |
| 501 | * starts the process of connecting to the target | 501 | * starts the process of connecting to the target |
| 502 | * sleeps untill the connection is established or rejected | 502 | * sleeps until the connection is established or rejected |
| 503 | */ | 503 | */ |
| 504 | int iser_connect(struct iser_conn *ib_conn, | 504 | int iser_connect(struct iser_conn *ib_conn, |
| 505 | struct sockaddr_in *src_addr, | 505 | struct sockaddr_in *src_addr, |