summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorRoland Dreier <rdreier@cisco.com>2009-03-27 02:25:49 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-27 03:00:25 +0300
commit7c757eb9f804782fb39d0ae2c1a88ffb9309138e (patch)
tree99caa29ce033e4ba8b14687022d5da4de3b76232 /firmware
parente2ab3dff9d515ef69ac7c245b5ad1e348f2106be (diff)
downloadlinux-7c757eb9f804782fb39d0ae2c1a88ffb9309138e.tar.xz
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>
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions