David S. Miller e1943424e4 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/bnx2x/bnx2x_ethtool.c		2011-04-19 00:21:33 -07:00
..
Makefile
qlcnic_ctx.c	qlcnic: Cleanup patch	2011-04-06 12:47:11 -07:00
qlcnic_ethtool.c	qlcnic: convert to set_phys_id	2011-04-06 15:05:45 -07:00
qlcnic_hdr.h	qlcnic: fix ocm window register offset calculation	2010-12-17 11:39:01 -08:00
qlcnic_hw.c	qlcnic: Fix LRO disable	2011-04-06 12:47:13 -07:00
qlcnic_init.c	qlcnic: Use flt method to determine flash fw region	2011-04-06 12:47:13 -07:00
qlcnic_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-19 00:21:33 -07:00
qlcnic.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-19 00:21:33 -07:00