Roland Dreier 7c757eb9f8 RDMA/nes: Fix mis-merge ...

When net-next and infiniband were merged upstream, each branch deleted
one of a pair of adjacent lines from nes_nic.c, but when Linus fixed the
conflict up, he brought back both of the lines.  Fix up to the intended
final tree state.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2009-03-26 17:00:25 -07:00

..

amso1100

infiniband: convert c2 to net_device_ops

2009-03-21 19:19:13 -07:00

cxgb3

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2009-03-26 15:54:36 -07:00

ehca

IB: Remove __constant_{endian} uses

2009-01-17 17:11:57 -08:00

ipath

Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-03-26 16:05:42 -07:00

mlx4

Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next

2009-03-24 20:44:41 -07:00

mthca

IB/mthca: Fix dispatch of IB_EVENT_LID_CHANGE event

2009-01-28 15:15:56 -08:00

nes

RDMA/nes: Fix mis-merge

2009-03-26 17:00:25 -07:00