David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
core	IB/cma: Accept connection without a valid netdev on RoCE	2015-10-06 14:25:16 -04:00
hw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
ulp	Changes for 4.3-rc5	2015-10-15 13:44:35 -07:00
Kconfig	IB/ehca: Deprecate driver, move to staging, schedule deletion	2015-09-11 18:13:35 -04:00
Makefile	IB: Allow build of hw/ and ulp/ subdirectories independently	2014-06-02 14:51:12 -07:00