David S. Miller 4fbef95af4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be.h drivers/net/usb/qmi_wwan.c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h include/net/netfilter/nf_conntrack_synproxy.h include/net/secure_seq.h The conflicts are of two varieties: 1) Conflicts with Joe Perches's 'extern' removal from header file function declarations. Usually it's an argument signature change or a function being added/removed. The resolutions are trivial. 2) Some overlapping changes in qmi_wwan.c and be.h, one commit adds a new value, another changes an existing value. That sort of thing. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-01 17:06:14 -04:00
..
bond_3ad.c	bonding: remove unused __get_next_agg()	2013-09-28 15:28:04 -07:00
bond_3ad.h	bonding: fix multiple 3ad mode sysfs race conditions	2013-05-19 23:25:49 -07:00
bond_alb.c	bonding: add bond_has_slaves() and use it	2013-09-26 16:02:06 -04:00
bond_alb.h	bonding: rework rlb_next_rx_slave() to use bond_for_each_slave()	2013-09-26 16:02:05 -04:00
bond_debugfs.c	bonding: delete migrated IP addresses from the rlb hash table	2012-11-30 12:07:27 -05:00
bond_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
bond_procfs.c	bonding: don't use bond_next_slave() in bond_info_seq_next()	2013-09-28 15:28:06 -07:00
bond_sysfs.c	net: create sysfs symlinks for neighbour devices	2013-09-26 16:02:08 -04:00
bonding.h	bonding: trivial: remove forgotten bond_next_vlan()	2013-09-30 15:39:17 -04:00
Makefile	bonding, ipv4, ipv6, vlan: Handle NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS	2011-04-17 23:36:03 -07:00