tree 99caa29ce033e4ba8b14687022d5da4de3b76232
parent e2ab3dff9d515ef69ac7c245b5ad1e348f2106be
author Roland Dreier <rdreier@cisco.com> 1238109949 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238112025 -0700

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>