| commit | 7c757eb9f804782fb39d0ae2c1a88ffb9309138e | [log] [tgz] |
|---|---|---|
| author | Roland Dreier <rdreier@cisco.com> | Thu Mar 26 16:25:49 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Mar 26 17:00:25 2009 -0700 |
| tree | 99caa29ce033e4ba8b14687022d5da4de3b76232 | |
| parent | e2ab3dff9d515ef69ac7c245b5ad1e348f2106be [diff] |
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>