David S. Miller 9cbc94eabb Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/vmxnet3/vmxnet3_ethtool.c net/core/dev.c		2011-05-17 17:33:11 -04:00
..
bond_3ad.c	net: bonding: factor out rlock(bond->lock) in xmit path	2011-05-09 12:05:59 -07:00
bond_3ad.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-05-17 17:33:11 -04:00
bond_alb.c	net: bonding: factor out rlock(bond->lock) in xmit path	2011-05-09 12:05:59 -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_ipv6.c	bonding/vlan: Fix mangled NAs on slaves without VLAN tag insertion	2010-12-16 12:43:22 -08:00
bond_main.c	bonding: convert to ndo_fix_features	2011-05-12 18:45:59 -04:00
bond_procfs.c	net-bonding: Fix minor sparse complaints	2011-04-14 22:00:31 -07:00
bond_sysfs.c	ipv4, ipv6, bonding: Restore control over number of peer notifications	2011-04-29 12:44:11 -07:00
bonding.h	net: drivers: kill two unused macro definitions	2011-05-15 18:01:15 -04:00
Makefile	bonding, ipv4, ipv6, vlan: Handle NETDEV_BONDING_FAILOVER like NETDEV_NOTIFY_PEERS	2011-04-17 23:36:03 -07:00