David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/batman-adv/bridge_loop_avoidance.c net/batman-adv/bridge_loop_avoidance.h net/batman-adv/soft-interface.c net/mac80211/mlme.c With merge help from Antonio Quartulli (batman-adv) and Stephen Rothwell (drivers/net/usb/qmi_wwan.c). The net/mac80211/mlme.c conflict seemed easy enough, accounting for a conversion to some new tracing macros. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-07-10 23:56:33 -07:00
..
bond_3ad.c	bonding: drop_monitor aware	2012-06-13 16:00:26 -07:00
bond_3ad.h	bonding: remove packet cloning in recv_probe()	2012-06-12 18:51:09 -07:00
bond_alb.c	bonding: drop_monitor aware	2012-06-13 16:00:26 -07:00
bond_alb.h	bonding: move processing of recv handlers into handle_frame()	2011-04-25 12:00:30 -07:00
bond_debugfs.c	bonding: debugfs and network namespaces are incompatible	2012-07-09 14:49:15 -07:00
bond_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-10 23:56:33 -07:00
bond_procfs.c	bonding: show all the link status of slaves	2012-06-17 16:23:54 -07:00
bond_sysfs.c	bonding:record primary when modify it via sysfs	2012-06-12 15:23:11 -07:00
bonding.h	bonding: remove packet cloning in recv_probe()	2012-06-12 18:51:09 -07:00
Makefile	bonding, ipv4, ipv6, vlan: Handle NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS	2011-04-17 23:36:03 -07:00