diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 23:40:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 23:40:36 -0400 |
| commit | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (patch) | |
| tree | c94ff327a6291672e1f9071a79bf61d63f5f0cb9 /drivers/net/mlx4/eq.c | |
| parent | 852fef69c0d9510a28a70221cfddd004efa02552 (diff) | |
| parent | cc9969c96765476db5e30c9e074a57838604c1d1 (diff) | |
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:
mlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files
mlx4_core: Add VLAN tag field to WQE control segment struct
RDMA/nes: CM connection setup/teardown rework
IPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG
IPoIB/cm: Connected mode is no longer EXPERIMENTAL
RDMA/ucm: BKL is not needed for ib_ucm_open()
RDMA/ucma: BKL is not needed for ucma_open()
Diffstat (limited to 'drivers/net/mlx4/eq.c')
| -rw-r--r-- | drivers/net/mlx4/eq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c index 7df928d3a3d8..8a8b56135a58 100644 --- a/drivers/net/mlx4/eq.c +++ b/drivers/net/mlx4/eq.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2005 Mellanox Technologies. All rights reserved. | 2 | * Copyright (c) 2005, 2006, 2007, 2008 Mellanox Technologies. All rights reserved. |
| 3 | * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved. | 3 | * Copyright (c) 2005, 2006, 2007 Cisco Systems, Inc. All rights reserved. |
| 4 | * | 4 | * |
| 5 | * This software is available to you under a choice of one of two | 5 | * This software is available to you under a choice of one of two |