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
..
amso1100	infiniband: convert c2 to net_device_ops	16 years ago
cxgb3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	16 years ago
ehca	IB: Remove __constant_{endian} uses	16 years ago
ipath	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	16 years ago
mlx4	Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4', 'mthca', 'nes' and 'sysfs' into for-next	16 years ago
mthca	IB/mthca: Fix dispatch of IB_EVENT_LID_CHANGE event	16 years ago
nes	RDMA/nes: Fix mis-merge	16 years ago