Stephen Rothwell ce96bc86bf net: merge fixup for qlge_main ... Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>		2010-01-28 06:13:13 -08:00
..
appletalk
arcnet	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
arm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
atl1c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
atl1e	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
atlx	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
benet	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
bonding	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
can	can: mscan-mpc5xxx: fix broken support for the MPC5200	2010-01-15 01:43:30 -08:00
chelsio	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
cris
cxgb3	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
e1000	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
e1000e	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
ehea
enic	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
fs_enet
hamradio	hamradio: avoid null deref v3	2010-01-03 21:42:50 -08:00
ibm_newemac
igb	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
igbvf	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
irda	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
ixgb	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
ixgbe	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
ixgbevf	netdev: remove HAVE_ leftovers	2010-01-28 06:01:35 -08:00
ixp2000
mlx4	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
myri10ge	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
netxen	netxen: fix sparse warning	2010-01-15 01:37:25 -08:00
octeon	drivers/net/octeon/octeon_mgmt.c: use %pM to shown MAC address	2009-12-29 20:09:07 -08:00
pcmcia	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
phy	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
qlcnic	qlcnic: Qlogic ethernet driver for CNA devices	2010-01-16 01:17:15 -08:00
qlge	net: merge fixup for qlge_main	2010-01-28 06:13:13 -08:00
sfc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
skfp	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
stmmac	net: use helpers to access uc list V2	2010-01-25 13:36:10 -08:00
tokenring	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
tulip	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
usb	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
vmxnet3	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
vxge	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
wan	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
wimax	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
wireless	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
3c59x.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c	Fix MAC address access in 3c507, ibmlana, pcnet32 and libertas	2009-12-26 20:24:45 -08:00
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c
7990.h
8139cp.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
8139too.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
8390.c
8390.h
8390p.c
82596.c
a2065.c
a2065.h
ac3200.c
acenic.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
acenic.h
amd8111e.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
amd8111e.h
apne.c
ariadne.c	ariadne: Fix build.	2010-01-26 05:17:00 -08:00
ariadne.h
at1700.c
atarilance.c	atarilance: timeout ignored in lance_open()	2010-01-03 21:42:52 -08:00
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
b44.h
bcm63xx_enet.c	bcm63xx_enet: fix compilation failure after get_stats_count removal	2009-12-15 21:12:22 -08:00
bcm63xx_enet.h
bfin_mac.c	bfin_mac: use the newer CLKBUFOE bit name via asm/dpmc.h	2010-01-19 01:59:18 -08:00
bfin_mac.h
bmac.c
bmac.h
bnx2_fw.h
bnx2.c	netdev: remove HAVE_ leftovers	2010-01-28 06:01:35 -08:00
bnx2.h	bnx2: Save statistics during reset.	2010-01-17 19:16:03 -08:00
bnx2x_dump.h
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h
bnx2x_init_ops.h
bnx2x_init.h
bnx2x_link.c
bnx2x_link.h
bnx2x_main.c	netdev: remove HAVE_ leftovers	2010-01-28 06:01:35 -08:00
bnx2x_reg.h
bnx2x.h
bsd_comp.c
cassini.c	netdev: remove HAVE_ leftovers	2010-01-28 06:01:35 -08:00
cassini.h
cnic_defs.h
cnic_if.h
cnic.c
cnic.h
cpmac.c	drivers/net/cpmac.c: Correct code taking the size of a pointer	2009-12-13 19:56:35 -08:00
cs89x0.c	cs89x0: Always report failure to request interrupt	2010-01-07 01:07:29 -08:00
cs89x0.h
davinci_emac.c	TI DaVinci EMAC: Handle emac module clock correctly.	2010-01-07 17:27:31 -08:00
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
defxx.h
depca.c
depca.h
dl2k.c
dl2k.h	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
dm9000.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
eql.c
es3210.c
eth16i.c
ethoc.c	ethoc: Use resource_size	2010-01-15 01:48:22 -08:00
ewrk3.c
ewrk3.h
fealnx.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec.c
fec.h
forcedeth.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
fsl_pq_mdio.c	fsl_pq_mdio: Fix iomem unmapping for non-eTSEC2.0 controllers	2009-12-30 22:03:43 -08:00
fsl_pq_mdio.h
gianfar_ethtool.c
gianfar_sysfs.c
gianfar.c	gianfar: Fix gianfar select_queue bogosity	2009-12-26 20:24:44 -08:00
gianfar.h	gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC	2009-12-18 20:38:37 -08:00
hamachi.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
hp100.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c	Fix MAC address access in 3c507, ibmlana, pcnet32 and libertas	2009-12-26 20:24:45 -08:00
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
ipg.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
ipg.h
isa-skeleton.c
iseries_veth.c
jazzsonic.c
jme.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
jme.h
Kconfig	NET: Add Qlogic ethernet driver for CNA devices	2010-01-16 01:17:16 -08:00
korina.c
ks8842.c
ks8851_mll.c	drivers/net: ks8851_mll ethernet network driver	2010-01-28 05:54:49 -08:00
ks8851.c
ks8851.h
lance.c
lasi_82596.c
lib8390.c
lib82596.c	drivers/net/lib82596.c: use %pM to shown MAC address	2009-12-29 20:01:46 -08:00
LICENSE.SRC
ll_temac_main.c	drivers/net : Correct the size argument to kzalloc	2010-01-03 21:42:51 -08:00
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
lp486e.c
mac89x0.c
mac8390.c	mac8390: Fix build breakage	2010-01-09 23:00:32 -08:00
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c	macvlan: add GRO bit to features mask	2010-01-16 01:05:38 -08:00
Makefile	NET: Add Qlogic ethernet driver for CNA devices	2010-01-16 01:17:16 -08:00
mdio.c
meth.c	netdev: remove HAVE_ leftovers	2010-01-28 06:01:35 -08:00
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	net: use helpers to access uc list V2	2010-01-25 13:36:10 -08:00
mvme147.c
myri_sbus.c	llc: use dev_hard_header	2009-12-26 20:38:23 -08:00
myri_sbus.h
natsemi.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
ne2.c
ne2k-pci.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
ne3210.c
ne-h8300.c
ne.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	net: use helpers to access uc list V2	2010-01-25 13:36:10 -08:00
niu.h
ns83820.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
pasemi_mac_ethtool.c
pasemi_mac.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
pasemi_mac.h
pci-skeleton.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
pcnet32.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c	ppp_generic.c severly whitespace damanged by 9c705260fe	2010-01-19 02:12:34 -08:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppol2tp.c
pppox.c
ps3_gelic_net.c
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
qla3xxx.c	drivers/net: Eliminate useless code	2010-01-18 00:29:19 -08:00
qla3xxx.h
r6040.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
r8169.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
rionet.c
rrunner.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
rrunner.h
s2io-regs.h
s2io.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
s2io.h
s6gmac.c
sb1000.c
sb1250-mac.c
sc92031.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
sh_eth.h
sis190.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
sis900.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
sis900.h
skge.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
skge.h
sky2.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
sky2.h
slhc.c
slip.c
slip.h
smc91x.c
smc91x.h
smc911x.c	drivers/net/smc911x.c: use %pM to shown MAC address	2009-12-29 20:08:09 -08:00
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
smsc911x.h
smsc9420.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
spider_net.h
starfire.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
sungem_phy.c
sungem_phy.h
sungem.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
sungem.h
sunhme.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c	drivers/net/sunvnet.c: use %pM to shown MAC address	2009-12-29 20:07:27 -08:00
sunvnet.h
tc35815.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
tehuti.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
tehuti.h
tg3.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
tg3.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
tlan.c	drivers/net/tlan: Remove TRUE/FALSE defines, use bool	2010-01-13 20:37:01 -08:00
tlan.h	drivers/net/tlan: Remove TRUE/FALSE defines, use bool	2010-01-13 20:37:01 -08:00
tsi108_eth.c
tsi108_eth.h
tun.c	tun: export underlying socket	2010-01-15 01:43:28 -08:00
typhoon.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-23 00:31:06 -08:00
ucc_geth.h	ucc_geth: Fix the wrong the Rx/Tx FIFO size	2010-01-06 20:32:38 -08:00
veth.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
via-rhine.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
via-velocity.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-10 22:55:03 -08:00
via-velocity.h
virtio_net.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-28 06:12:38 -08:00
wd.c
xen-netfront.c
xilinx_emaclite.c	drivers/net/xilinx_emaclite.c: use %pM to shown MAC address	2009-12-29 20:04:53 -08:00
xtsonic.c
yellowfin.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00
znet.c
zorro8390.c