David S. Miller 4b87f92259 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/networking/ip-sysctl.txt drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c Both conflicts were simply overlapping context. A build fix for qlcnic is in here too, simply removing the added devinit annotations which no longer exist. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-01-15 15:05:59 -05:00
..
Makefile
qlge.h	qlge: Bumped driver version to 1.00.00.31	2012-07-10 23:28:34 -07:00
qlge_dbg.c	drivers: ethernet: qlogic: qlge_dbg.c: Fixed a coding style issue	2012-11-06 17:41:42 -05:00
qlge_ethtool.c	qlge: fix an "&&" vs "||" bug	2012-07-18 09:40:53 -07:00
qlge_main.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-01-15 15:05:59 -05:00
qlge_mpi.c