Linus Torvalds 91aa69315e Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (21 commits) natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards natsemi: Add support for using MII port with no PHY skge: race with workq and RTNL Replace local random function with random32() s2io: RTNL and flush_scheduled_work deadlock 8139too: RTNL and flush_scheduled_work deadlock sis190: RTNL and flush_scheduled_work deadlock r8169: RTNL and flush_scheduled_work deadlock [PATCH] ieee80211softmac: Fix setting of initial transmit rates [PATCH] bcm43xx: OFDM fix for rev 1 cards [PATCH] bcm43xx: Fix for 4311 and 02/07/07 specification changes [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepaths [PATCH] zd1211rw: Readd zd_addr_t cast [PATCH] bcm43xx: Fix for oops on resume [PATCH] bcm43xx: Ignore ampdu status reports [PATCH] wavelan: Use ARRAY_SIZE macro when appropriate [PATCH] hostap: Use ARRAY_SIZE macro when appropriate [PATCH] misc-wireless: Use ARRAY_SIZE macro when appropriate [PATCH] ipw2100: Use ARRAY_SIZE macro when appropriate [PATCH] bcm43xx: Janitorial change - remove two unused variables ...		2007-02-20 10:26:46 -08:00
..
appletalk
arcnet	bugfixes and new hardware support for arcnet driver	2007-02-17 15:30:48 -05:00
arm	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
atl1	atl1: bump version number	2007-02-17 15:17:05 -05:00
bonding	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
chelsio	git-netdev-all: chelsio fix	2007-02-05 16:58:49 -05:00
cris	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
cxgb3	cxgb3 Fix copyrights in the cxgb3 driver.	2007-02-17 15:30:46 -05:00
e1000	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2007-02-19 13:29:02 -08:00
ehea	Merge branch 'master' into upstream	2007-02-17 15:11:43 -05:00
fec_8xx	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
fs_enet	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
hamradio	Replace local random function with random32()	2007-02-20 11:18:13 -05:00
ibm_emac	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
irda	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
ixgb	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2007-02-07 19:23:44 -08:00
ixp2000
myri10ge	remove NETIF_F_TSO ifdefery	2007-02-05 16:58:45 -05:00
netxen	NetXen: Fix to get the driver working after sparse changes	2007-02-17 15:26:45 -05:00
pcmcia	PCMCIA-NETDEV : the 2nd argument of el3_interrrupt and smc_interrupt is struct net_device*	2007-02-17 15:16:08 -05:00
phy	phylib: Add support for Marvell 88e1111S and 88e1145	2007-02-17 15:16:08 -05:00
sk98lin	sk98lin: planned removal	2007-02-17 15:37:14 -05:00
skfp	net: use bitrev8	2007-02-05 16:58:47 -05:00
tokenring
tulip
wan	Hostess SV-11 depends on INET	2007-02-17 15:39:37 -05:00
wireless	Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream	2007-02-20 11:28:42 -05:00
3c59x.c	NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()	2007-02-06 19:10:33 -05:00
3c501.c
3c501.h
3c503.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c	[PATCH] Scheduled removal of SA_xxx interrupt flags fixups	2007-02-14 08:09:54 -08:00
7990.h
8139cp.c	8139cp: Don't blindly enable interrupts	2007-01-18 11:47:22 -05:00
8139too.c	8139too: RTNL and flush_scheduled_work deadlock	2007-02-20 11:18:12 -05:00
8390.c
8390.h
82596.c	82596 warning fixes	2007-01-30 09:36:01 -05:00
a2065.c
a2065.h
ac3200.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
acenic_firmware.h
acenic.c
acenic.h
amd8111e.c	NET: turn local_save_flags() + local_irq_disable() into local_irq_save()	2007-02-06 19:10:34 -05:00
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atari_bionet.c
atari_pamsnet.c
atarilance.c
atp.c
atp.h
au1000_eth.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
au1000_eth.h
b44.c	B44: increase wait loop	2007-02-17 15:37:14 -05:00
b44.h	b44 endian annotations	2007-02-06 19:03:56 -05:00
bmac.c	net: use bitrev8	2007-02-05 16:58:47 -05:00
bmac.h
bnx2_fw2.h
bnx2_fw.h
bnx2.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2007-02-07 19:23:44 -08:00
bnx2.h	[BNX2]: PHY workaround for 5709 A0.	2007-02-02 00:46:35 -08:00
bsd_comp.c
cassini.c
cassini.h
cs89x0.c
cs89x0.h
de600.c
de600.h
de620.c
de620.h
declance.c	mips: declance: Driver model for the PMAD-A	2007-02-07 18:49:11 -05:00
defxx.c	[TC] defxx: TURBOchannel support	2007-02-09 16:23:17 +00:00
defxx.h	[TC] defxx: TURBOchannel support	2007-02-09 16:23:17 +00:00
depca.c
depca.h
dgrs_asstruct.h
dgrs_bcomm.h
dgrs_es4h.h
dgrs_ether.h
dgrs_firmware.c
dgrs_i82596.h
dgrs_plx9060.h
dgrs.c
dgrs.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dummy.c
e100.c	e100: fix napi ifdefs removing needed code	2007-02-02 08:34:10 -05:00
e2100.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
eepro100.c
eepro.c
eexpress.c	drivers/net/eexpress.c: remove duplicate comment	2007-02-17 19:56:23 +01:00
eexpress.h
epic100.c
eql.c
es3210.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c
fec.c
fec.h
forcedeth.c	forcedeth: statistics optimization	2007-02-05 16:58:48 -05:00
gianfar_ethtool.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
gianfar_mii.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
gianfar_mii.h
gianfar_sysfs.c	Merge branch 'master' into upstream	2007-02-17 15:11:43 -05:00
gianfar.c	gianfar: don't duplicate gfar_error()	2007-02-17 15:26:45 -05:00
gianfar.h
hamachi.c
hp100.c	hp100: convert pci_module_init() to pci_register_driver()	2007-02-06 19:10:33 -05:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	[PATCH] mark struct file_operations const 5	2007-02-12 09:48:45 -08:00
ibmveth.h
ifb.c	Revert "net: ifb error path loop fix"	2007-01-30 14:11:12 -08:00
ioc3-eth.c	Fix link autonegotiation timer.	2007-02-17 15:37:14 -05:00
isa-skeleton.c
iseries_veth.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
jazzsonic.c
Kconfig	[NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012]	2007-02-20 17:11:55 +00:00
lance.c
lasi_82596.c
lib8390.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	macb: Remove inappropriate spinlocks around mii calls	2007-02-17 15:30:48 -05:00
macb.h	AT91: MACB support	2007-02-07 18:50:53 -05:00
mace.c	net: use bitrev8	2007-02-05 16:58:47 -05:00
mace.h
macmace.c	net: use bitrev8	2007-02-05 16:58:47 -05:00
macsonic.c	[PATCH] missing include in macsonic	2007-02-09 08:28:48 -08:00
Makefile	Add Attansic L1 ethernet driver.	2007-02-08 10:42:37 -05:00
meth.c	Convert meth to netdev_priv	2007-02-17 15:30:47 -05:00
meth.h
mii.c
mipsnet.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
mipsnet.h
mv643xx_eth.c	[PATCH] misc duplicate field initializers	2007-02-09 09:14:07 -08:00
mv643xx_eth.h
mvme147.c
myri_code.h
myri_sbus.c
myri_sbus.h
natsemi.c	natsemi: Support Aculab E1/T1 PMXc cPCI carrier cards	2007-02-20 11:18:13 -05:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
ns83820.c
pasemi_mac.c	PA Semi PWRficient Ethernet driver	2007-02-05 16:58:52 -05:00
pasemi_mac.h	PA Semi PWRficient Ethernet driver	2007-02-05 16:58:52 -05:00
pci-skeleton.c
pcnet32.c
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c	[PATCH] mark struct file_operations const 5	2007-02-12 09:48:45 -08:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c	[PATCH] mark struct file_operations const 5	2007-02-12 09:48:45 -08:00
pppox.c
qla3xxx.c	[PATCH] Scheduled removal of SA_xxx interrupt flags fixups	2007-02-14 08:09:54 -08:00
qla3xxx.h	qla3xxx: Add support for Qlogic 4032 chip.	2007-02-05 16:58:47 -05:00
r8169.c	r8169: RTNL and flush_scheduled_work deadlock	2007-02-20 11:18:12 -05:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h	s2io: De-typedef driver.	2007-02-05 16:58:52 -05:00
s2io.c	s2io: RTNL and flush_scheduled_work deadlock	2007-02-20 11:18:13 -05:00
s2io.h	[PATCH] trivial s2io annotations	2007-02-09 09:14:08 -08:00
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c
sc92031.c	[PATCH] Scheduled removal of SA_xxx interrupt flags fixups 2	2007-02-14 08:09:55 -08:00
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
shaper.c
sis190.c	sis190: RTNL and flush_scheduled_work deadlock	2007-02-20 11:18:12 -05:00
sis900.c	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
sis900.h
skge.c	skge: race with workq and RTNL	2007-02-20 11:18:13 -05:00
skge.h	skge: WOL support	2007-02-06 19:07:44 -05:00
sky2.c	sky2: v1.13	2007-02-17 15:30:47 -05:00
sky2.h	sky2: transmit timeout	2007-02-17 15:30:47 -05:00
slhc.c
slip.c	[NET] slip: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls	2007-02-08 12:38:55 -08:00
slip.h
smc91x.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
smc91x.h
smc911x.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
smc911x.h
smc9194.c
smc9194.h
smc-mca.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
smc-ultra32.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
smc-ultra.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
sonic.c
sonic.h
Space.c	remove the broken SKMC driver	2007-02-05 16:58:46 -05:00
spider_net_ethtool.c	Spidernet DMA coalescing	2007-02-05 16:58:43 -05:00
spider_net.c	[PATCH] spider_net breakage from class_device -> device	2007-02-09 08:28:48 -08:00
spider_net.h	Spidernet remove rxramfull tasklet	2007-02-05 16:58:44 -05:00
starfire_firmware.h
starfire_firmware.pl
starfire.c
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
sungem_phy.h
sungem.c
sungem.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
tc35815.c
tg3.c	[TG3]: Update copyright, version, and reldate.	2007-02-13 12:18:46 -08:00
tg3.h	[TG3]: Use constant for PHY register 0x1e.	2007-02-13 12:18:15 -08:00
tlan.c
tlan.h
tsi108_eth.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
tsi108_eth.h
tun.c	[PATCH] mark struct file_operations const 5	2007-02-12 09:48:45 -08:00
typhoon-firmware.h
typhoon.c
typhoon.h
ucc_geth_phy.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
ucc_geth_phy.h
ucc_geth.c	[PATCH] Scheduled removal of SA_xxx interrupt flags fixups	2007-02-14 08:09:54 -08:00
ucc_geth.h
via-rhine.c
via-velocity.c
via-velocity.h
wd.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
yellowfin.c
znet.c
zorro8390.c