diff options
| author | Benjamin Herrenschmidt | 2012-09-07 01:48:59 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2012-09-07 01:48:59 +0200 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /drivers/infiniband/ulp/srpt | |
| parent | powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t (diff) | |
| parent | powerpc: Don't use __put_user() in patch_instruction (diff) | |
| download | kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.tar.gz kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.tar.xz kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.zip | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'drivers/infiniband/ulp/srpt')
| -rw-r--r-- | drivers/infiniband/ulp/srpt/ib_srpt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c index 7a0ce8d42887..9e1449f8c6a2 100644 --- a/drivers/infiniband/ulp/srpt/ib_srpt.c +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c @@ -1469,7 +1469,7 @@ static void srpt_handle_send_comp(struct srpt_rdma_ch *ch, * * XXX: what is now target_execute_cmd used to be asynchronous, and unmapping * the data that has been transferred via IB RDMA had to be postponed until the - * check_stop_free() callback. None of this is nessecary anymore and needs to + * check_stop_free() callback. None of this is necessary anymore and needs to * be cleaned up. */ static void srpt_handle_rdma_comp(struct srpt_rdma_ch *ch, |