David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
bond_3ad.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
bond_alb.c	bonding: attempt to better support longer hw addresses	2017-04-05 18:44:54 -07: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	2017-06-15 11:59:32 -04:00
bond_netlink.c	bonding: check nla_put_be32 return value	2017-05-08 14:57:05 -04:00
bond_options.c	bonding: Prevent duplicate userspace notification	2017-05-27 18:51:41 -04:00
bond_procfs.c	bonding: attempt to better support longer hw addresses	2017-04-05 18:44:54 -07: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
bond_sysfs.c	sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>	2017-03-02 08:42:32 +01: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