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
..
bcmgenet_wol.c	net: bcmgenet: properly disable password matching	2015-03-05 21:15:21 -05:00
bcmgenet.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
bcmgenet.h	net: bcmgenet: fix dev->stats.tx_bytes accounting	2016-03-24 15:11:39 -04:00
bcmmii.c	net: bcmgenet: Properly configure PHY to ignore interrupt	2016-01-21 10:48:51 -08:00
Makefile	net: bcmgenet: add Wake-on-LAN support code	2014-07-21 16:04:31 -07:00