1
0
Fork 0
alistair23-linux/drivers/net/ethernet/chelsio
David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were two cases of simple overlapping changes,
nothing serious.

In the UDP case, we need to add a hlist_add_tail_rcu()
to linux/rculist.h, because we've moved UDP socket handling
away from using nulls lists.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-04-23 18:51:33 -04:00
..
cxgb chelsio: constify cphy_ops structures 2016-01-04 21:58:28 -05:00
cxgb3 cxgb3: fix up vpd strings for kstrto*() 2016-02-19 15:49:31 -05:00
cxgb4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-04-23 18:51:33 -04:00
cxgb4vf cxgb4/cxgb4vf: Deprecate module parameter dflt_msg_enable 2016-04-06 16:17:25 -04:00
Kconfig cxgb4: update Kconfig and Makefile 2016-03-22 00:25:06 -07:00
Makefile