You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Roland Dreier 7c757eb9f8 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>		16 years ago
..
Kconfig	RDMA/nes: Use LRO	17 years ago
Makefile	…
nes.c	RDMA/nes: Update copyright to new legal entity and year	16 years ago
nes.h	RDMA/nes: Update copyright to new legal entity and year	16 years ago
nes_cm.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	16 years ago
nes_cm.h	RDMA/nes: Handle MPA Reject message properly	16 years ago
nes_context.h	RDMA/nes: Update copyright to new legal entity and year	16 years ago
nes_hw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	16 years ago
nes_hw.h	RDMA/nes: Remove LLTX	16 years ago
nes_nic.c	RDMA/nes: Fix mis-merge	16 years ago
nes_user.h	RDMA/nes: Update copyright to new legal entity and year	16 years ago
nes_utils.c	RDMA/nes: Update copyright to new legal entity and year	16 years ago
nes_verbs.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	16 years ago
nes_verbs.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	16 years ago