David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/amd/xgbe/xgbe-desc.c
	drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-12-10 15:48:20 -05:00

..

bond_3ad.c

bonding: Introduce 4 AD link speed to fix agg_bandwidth

2014-11-19 19:10:16 -05:00

bond_alb.c

vlan: kill vlan_put_tag helper

2014-11-21 14:20:17 -05:00

bond_debugfs.c

net: Move bonding headers under include/net

2014-11-10 13:27:49 -05:00

bond_main.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-11-21 22:28:24 -05:00

bond_netlink.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-12-10 15:48:20 -05:00

bond_options.c

net: Move bonding headers under include/net

2014-11-10 13:27:49 -05:00

bond_procfs.c

net: Move bonding headers under include/net

2014-11-10 13:27:49 -05:00

bond_sysfs_slave.c

net: Move bonding headers under include/net

2014-11-10 13:27:49 -05:00

bond_sysfs.c

net: Move bonding headers under include/net

2014-11-10 13:27:49 -05:00

Makefile

bonding: add sysfs /slave dir for bond slave devices.

2014-01-17 18:51:58 -08:00