linux-stable/drivers/net/bonding
David S. Miller 43b03f1f6d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	MAINTAINERS
	drivers/net/wireless/iwlwifi/pcie/trans.c

The iwlwifi conflict was resolved by keeping the code added
in 'net' that turns off the buggy chip feature.

The MAINTAINERS conflict was merely overlapping changes, one
change updated all the wireless web site URLs and the other
changed some GIT trees to be Johannes's instead of John's.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-12 21:59:18 -07:00
..
bond_3ad.c bonding: remove packet cloning in recv_probe() 2012-06-12 18:51:09 -07:00
bond_3ad.h bonding: remove packet cloning in recv_probe() 2012-06-12 18:51:09 -07:00
bond_alb.c bonding: remove packet cloning in recv_probe() 2012-06-12 18:51:09 -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 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-12 21:59:18 -07:00
bond_procfs.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-07 10:55:33 -08: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