diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 15:47:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 15:47:08 -0700 |
| commit | 39b566eedbe9e35d38502cc5e62ef7abf1aff9c9 (patch) | |
| tree | 114d963f3eb4e8aff401ed74ae0429aefc55c9fd /drivers/infiniband/hw/nes/nes_verbs.h | |
| parent | 39f15003c7b268e4199d5ddce60a6944a74a14b7 (diff) | |
| parent | 09f98bafea792644f2dea39eb080aa57d854f5b3 (diff) | |
| download | kernel_samsung_smdk4412-39b566eedbe9e35d38502cc5e62ef7abf1aff9c9.tar.gz kernel_samsung_smdk4412-39b566eedbe9e35d38502cc5e62ef7abf1aff9c9.tar.bz2 kernel_samsung_smdk4412-39b566eedbe9e35d38502cc5e62ef7abf1aff9c9.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (30 commits)
RDMA/cxgb3: Enforce required firmware
IB/mlx4: Unregister IB device prior to CLOSE PORT command
mlx4_core: Add link type autosensing
mlx4_core: Don't perform SET_PORT command for Ethernet ports
RDMA/nes: Handle MPA Reject message properly
RDMA/nes: Improve use of PBLs
RDMA/nes: Remove LLTX
RDMA/nes: Inform hardware that asynchronous event has been handled
RDMA/nes: Fix tmp_addr compilation warning
RDMA/nes: Report correct vendor_id and vendor_part_id
RDMA/nes: Update copyright to new legal entity and year
RDMA/nes: Account for freed PBL after HW operation
IB: Remove useless ibdev_is_alive() tests from sysfs code
IB/sa_query: Fix AH leak due to update_sm_ah() race
IB/mad: Fix ib_post_send_mad() returning 0 with no generate send comp
IB/mad: initialize mad_agent_priv before putting on lists
IB/mad: Fix null pointer dereference in local_completions()
IB/mad: Fix RMPP header RRespTime manipulation
IB/iser: Remove hard setting of path MTU
mlx4_core: Add device IDs for MT25458 10GigE devices
...
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_verbs.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h index ae0ca9bc83b..5e48f67fbe8 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.h +++ b/drivers/infiniband/hw/nes/nes_verbs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006 - 2008 NetEffect, Inc. All rights reserved. + * Copyright (c) 2006 - 2009 Intel-NE, Inc. All rights reserved. * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved. * * This software is available to you under a choice of one of two |