linux/drivers/net/ethernet/qlogic
David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-03 23:32:12 -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-06-03 23:32:12 -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