David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
cxgb4_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
cxgb4_uld.h	cxgb4: Query firmware for T5 ULPTX MEMWRITE DSGL capabilities	2014-02-18 16:23:01 -05:00
cxgb4.h	cxgb4: Query firmware for T5 ULPTX MEMWRITE DSGL capabilities	2014-02-18 16:23:01 -05:00
l2t.c	cxgb4: silence shift wrapping static checker warning	2014-01-13 11:15:58 -08:00
l2t.h	cxgb4: Add API to correctly calculate tuple fields	2013-12-22 18:09:08 -05:00
Makefile	chelsio: Move the Chelsio drivers	2011-08-10 19:54:52 -07:00
sge.c	cxgb4: Don't assume LSO only uses SGL path in t4_eth_xmit()	2014-02-18 16:23:01 -05:00
t4_hw.c	cgxb4: Stop using ethtool SPEED_* constants	2014-02-24 19:04:08 -05:00
t4_hw.h	cxgb4: Initialize T5	2013-03-14 11:35:53 -04:00
t4_msg.h	cxgb4: Add routines to create and remove listening IPv6 servers	2013-08-12 12:33:36 -07:00
t4_regs.h	cxgb4: Add API to correctly calculate tuple fields	2013-12-22 18:09:08 -05:00
t4fw_api.h	cxgb4: Query firmware for T5 ULPTX MEMWRITE DSGL capabilities	2014-02-18 16:23:01 -05:00