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
..
bcm_sf2.c	net: dsa: constify probed name	2016-04-17 18:54:14 -04:00
bcm_sf2.h
bcm_sf2_regs.h
Kconfig
Makefile
mv88e6xxx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
mv88e6xxx.h	net: dsa: mv88e6xxx: remove switch ID from ps	2016-04-17 18:54:15 -04:00
mv88e6060.c	net: dsa: constify probed name	2016-04-17 18:54:14 -04:00
mv88e6060.h	net: dsa: Keep the mii bus and address in the private structure	2016-04-13 18:15:23 -04:00
mv88e6123.c	net: dsa: mv88e6xxx: add number of db to info	2016-04-17 18:54:15 -04:00
mv88e6131.c	net: dsa: mv88e6xxx: add number of db to info	2016-04-17 18:54:15 -04:00
mv88e6171.c	net: dsa: mv88e6xxx: add number of db to info	2016-04-17 18:54:15 -04:00
mv88e6352.c	net: dsa: mv88e6xxx: add number of db to info	2016-04-17 18:54:15 -04:00