David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/r8152.c net/netfilter/nfnetlink.c Both r8152 and nfnetlink conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-10-02 11:25:43 -07:00
..
netxen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-10-02 11:25:43 -07:00
qlcnic	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-10-02 11:25:43 -07:00
qlge	qlge: Fix compilation warning	2014-09-22 14:35:33 -04:00
Kconfig	qlcnic: Fix Kconfig dependency on HWMON	2014-05-07 17:23:25 -04:00
Makefile	…
qla3xxx.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
qla3xxx.h	…