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
..
netxen	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
qlcnic	net: introduce and use netdev_features_t for device features sets	2011-11-16 17:43:10 -05:00
qlge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-11-26 14:47:03 -05:00
Kconfig	drivers/net/ethernet/*: Enabled vendor Kconfig options	2011-08-27 00:58:56 -07:00
Makefile	qlogic: Move the QLogic drivers	2011-08-10 20:03:49 -07:00
qla3xxx.c	Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers	2011-11-22 16:43:32 -05:00
qla3xxx.h	qlogic: Move the QLogic drivers	2011-08-10 20:03:49 -07:00