path: root/firmware/yam
diff options
authorRoland Dreier <>2009-03-26 16:25:49 -0700
committerLinus Torvalds <>2009-03-26 17:00:25 -0700
commit7c757eb9f804782fb39d0ae2c1a88ffb9309138e (patch)
tree99caa29ce033e4ba8b14687022d5da4de3b76232 /firmware/yam
parente2ab3dff9d515ef69ac7c245b5ad1e348f2106be (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 <> Acked-by: David S. Miller <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'firmware/yam')
0 files changed, 0 insertions, 0 deletions