David S. Miller b3ff29d2cc Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/Kconfig		2009-02-03 00:15:35 -08:00
..
Makefile
qlge_dbg.c	qlge: Get rid of split addresses in hardware control blocks.	2009-01-11 00:07:34 -08:00
qlge_ethtool.c
qlge_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-02-03 00:15:35 -08:00
qlge_mpi.c
qlge.h	qlge: bugfix: Fix endian issue when reading flash.	2009-02-02 13:53:57 -08:00