projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e2ab3df) | patch
RDMA/nes: Fix mis-merge
authorRoland Dreier <rdreier@cisco.com>
Thu, 26 Mar 2009 23:25:49 +0000 (16:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 Mar 2009 00:00:25 +0000 (17:00 -0700)
commit7c757eb9f804782fb39d0ae2c1a88ffb9309138e
tree99caa29ce033e4ba8b14687022d5da4de3b76232tree | snapshot
parente2ab3dff9d515ef69ac7c245b5ad1e348f2106becommit | 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>
drivers/infiniband/hw/nes/nes_nic.c diff | blob | history
John Crispins staging tree