David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c drivers/net/usb/sr9800.c drivers/net/usb/usbnet.c include/linux/usb/usbnet.h net/ipv4/tcp_ipv4.c net/ipv6/tcp_ipv6.c The TCP conflicts were overlapping changes. In 'net' we added a READ_ONCE() to the socket cached RX route read, whilst in 'net-next' Eric Dumazet touched the surrounding code dealing with how mini sockets are handled. With USB, it's a case of the same bug fix first going into net-next and then I cherry picked it back into net. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-02 16:16:53 -04:00
..
bond_3ad.c	bonding: Fix another case of LACPDU not sent on slave	2015-03-31 17:14:26 -04: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	2015-04-02 16:16:53 -04: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	bonding: update bond carrier state when min_links option changes	2015-01-27 17:09:03 -08:00
bond_procfs.c	bonding: Implement port churn-machine (AD standard 43.4.17).	2015-02-24 16:05:48 -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