David S. Miller 6dec4ac4ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/inet_diag.c		2011-11-26 14:47:03 -05:00
..
Makefile
qlge_dbg.c
qlge_ethtool.c	sweep the floors and convert some .get_drvinfo routines to strlcpy	2011-11-08 15:11:57 -05:00
qlge_main.c	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
qlge_mpi.c
qlge.h	qlge: fix size of external list for TX address descriptors	2011-11-23 19:10:00 -05:00