David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
bond_3ad.c	bonding: 3ad: allow to set ad_actor settings while the bond is up	2016-02-11 04:31:11 -05:00
bond_alb.c	bonding: Return correct error code	2016-02-11 09:43:25 -05:00
bond_debugfs.c	net: Move bonding headers under include/net	2014-11-10 13:27:49 -05:00
bond_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
bond_netlink.c	bonding: add tlb_dynamic_lb netlink support	2015-07-31 15:35:55 -07:00
bond_options.c	bonding: 3ad: allow to set ad_actor settings while the bond is up	2016-02-11 04:31:11 -05:00
bond_procfs.c	bonding: Display LACP info only to CAP_NET_ADMIN capable user	2015-06-23 03:11:52 -07:00
bond_sysfs.c	bonding: make mii_status sysfs node consistent	2016-01-11 17:14:42 -05:00
bond_sysfs_slave.c	bonding: export slave's partner_oper_port_state via sysfs and netlink	2015-06-15 16:40:24 -07:00
bonding_priv.h	net/bonding: Make DRV macros private	2015-04-26 22:59:53 -04:00
Makefile	bonding: add sysfs /slave dir for bond slave devices.	2014-01-17 18:51:58 -08:00