Linus Torvalds c63a119036 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (23 commits) iwlwifi: fix rf_kill state inconsistent during suspend and resume b43: Fix rfkill radio LED bcm43xx_debugfs sscanf fix libertas: select WIRELESS_EXT iwlwifi3945/4965: fix rate control algo reference leak ieee80211_rate: missed unlock wireless/ipw2200.c: add __dev{init,exit} annotations zd1211rw: Fix alignment problems libertas: add Dan Williams as maintainer sis190 endianness ucc_geth: really fix section mismatch pcnet_cs: add new id ixgb: make sure jumbos stay enabled after reset Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED net: smc911x: shut up compiler warnings ucc_geth: minor whitespace fix drivers/net/s2io.c section fixes drivers/net/sis190.c section fix hamachi endianness fixes e100: free IRQ to remove warningwhenrebooting ...		2007-12-17 19:29:41 -08:00
..
appletalk
arcnet
arm
atl1
bonding	bonding: Fix race at module unload	2007-12-07 15:00:34 -05:00
chelsio
cris
cxgb3	cxgb3 - T3C support update	2007-12-07 15:00:36 -05:00
e1000	e1000: fix memcpy in e1000_get_strings	2007-12-07 15:01:43 -05:00
e1000e	e1000: fix memcpy in e1000_get_strings	2007-12-07 15:01:43 -05:00
ehea
fec_8xx
fs_enet	[POWERPC] Fix typo #ifdef -> #ifndef	2007-12-13 22:44:09 -06:00
hamradio
ibm_emac
ibm_newemac	Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED	2007-12-14 16:12:45 -05:00
irda	[IRDA]: stir4200 fixes.	2007-12-16 14:09:44 -08:00
ixgb	ixgb: make sure jumbos stay enabled after reset	2007-12-14 16:12:47 -05:00
ixgbe
ixp2000
mlx4
myri10ge	[LRO]: fix lro_gen_skb() alignment	2007-12-05 05:37:32 -08:00
netxen
pcmcia	pcnet_cs: add new id	2007-12-17 16:02:15 -05:00
phy	PHY: Add the phy_device_release device method.	2007-12-04 15:06:33 -05:00
sk98lin
skfp
tokenring
tulip
usb
wan	[SYNCPPP]: Endianness and 64bit fixes.	2007-12-14 13:54:38 -08:00
wireless	iwlwifi: fix rf_kill state inconsistent during suspend and resume	2007-12-17 17:01:40 -05:00
3c59x.c
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c
7990.h
8139cp.c
8139too.c
8390.c
8390.h
82596.c
a2065.c
a2065.h
ac3200.c
acenic_firmware.h
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c
b44.h
bfin_mac.c
bfin_mac.h
bmac.c
bmac.h
bnx2_fw2.h
bnx2_fw.h
bnx2.c	[BNX2]: Update version to 1.6.9.	2007-12-11 02:45:31 -08:00
bnx2.h	[BNX2]: Fix RX packet rot.	2007-12-11 02:45:30 -08:00
bsd_comp.c
cassini.c
cassini.h
cpmac.c
cs89x0.c
cs89x0.h
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c
depca.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dummy.c
e100.c	e100: free IRQ to remove warningwhenrebooting	2007-12-14 15:26:07 -05:00
e2100.c
eepro100.c
eepro.c
eexpress.c
eexpress.h
epic100.c
eql.c
es3210.c
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c
fec_mpc52xx.c	Fix memory corruption in fec_mpc52xx	2007-12-04 14:53:14 -05:00
fec_mpc52xx.h
fec.c
fec.h
forcedeth.c
gianfar_ethtool.c
gianfar_mii.c
gianfar_mii.h
gianfar_sysfs.c
gianfar.c	gianfar: fix compile warning	2007-12-04 15:06:11 -05:00
gianfar.h
hamachi.c	hamachi endianness fixes	2007-12-14 15:26:15 -05:00
hp100.c
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c
ipg.c
ipg.h
isa-skeleton.c
iseries_veth.c
jazzsonic.c
Kconfig	Revert "make bnx2x select ZLIB_INFLATE"	2007-12-11 19:28:36 -08:00
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c
Makefile
meth.c
meth.h
mii.c
mipsnet.c
mipsnet.h
mv643xx_eth.c
mvme147.c
myri_code.h
myri_sbus.c
myri_sbus.h
natsemi.c
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
niu.c	[NIU]: Fix link LED handling.	2007-12-07 01:05:47 -08:00
niu.h
ns83820.c
pasemi_mac.c	pasemi_mac: Fix reuse of free'd skb	2007-12-04 14:53:49 -05:00
pasemi_mac.h
pci-skeleton.c
pcnet32.c
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppol2tp.c
pppox.c
ps3_gelic_net.c
ps3_gelic_net.h
qla3xxx.c
qla3xxx.h
r8169.c
rionet.c
rrunner.c
rrunner.h
s2io-regs.h	S2io: Check for register initialization completion before accesing device registers	2007-12-07 15:09:06 -05:00
s2io.c	drivers/net/s2io.c section fixes	2007-12-14 15:26:22 -05:00
s2io.h
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
shaper.c
sis190.c	sis190 endianness	2007-12-17 16:02:28 -05:00
sis900.c
sis900.h
skge.c
skge.h
sky2.c	sky2: RX lockup fix	2007-12-14 15:25:47 -05:00
sky2.h
slhc.c
slip.c
slip.h
smc91x.c
smc91x.h
smc911x.c	SMC911X: Fix using of dereferenced skb after netif_rx	2007-12-04 14:53:43 -05:00
smc911x.h	net: smc911x: shut up compiler warnings	2007-12-14 16:12:42 -05:00
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire_firmware.h
starfire_firmware.pl
starfire.c	starfire VLAN fix	2007-12-14 15:26:04 -05:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c	sundance fixes	2007-12-14 15:26:00 -05:00
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti_fw.h
tehuti.c
tehuti.h
tg3.c
tg3.h
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c
typhoon-firmware.h
typhoon.c
typhoon.h
ucc_geth_ethtool.c
ucc_geth_mii.c
ucc_geth_mii.h	ucc_geth: really fix section mismatch	2007-12-17 16:02:20 -05:00
ucc_geth.c	ucc_geth: minor whitespace fix	2007-12-14 16:12:38 -05:00
ucc_geth.h
veth.c
via-rhine.c
via-velocity.c
via-velocity.h
virtio_net.c
wd.c
xen-netfront.c
yellowfin.c
znet.c
zorro8390.c