linux/drivers/net/bonding
David S. Miller e486463e82 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/usb/qmi_wwan.c
	net/batman-adv/translation-table.c
	net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-25 15:50:32 -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: add the debugfs interface to see RLB hash table 2010-12-16 13:16:05 -08:00
bond_main.c bonding: drop_monitor aware 2012-06-13 16:00:26 -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