David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/Makefile net/ipv6/sysctl_net_ipv6.c Two ipv6_table_template[] additions overlap, so the index of the ipv6_table[x] assignments needed to be adjusted. In the drivers/net/Makefile case, we've gotten rid of the garbage whereby we had to list every single USB networking driver in the top-level Makefile, there is just one "USB_NETWORKING" that guards everything. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-08-05 18:46:26 -07:00
..
netxen	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
qlcnic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-05 18:46:26 -07:00
qlge	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
Kconfig	qlcnic: Fix Kconfig dependency on HWMON	2014-05-07 17:23:25 -04:00
Makefile
qla3xxx.c	net: get rid of SET_ETHTOOL_OPS	2014-05-13 17:43:20 -04:00
qla3xxx.h