Linus Torvalds 6ed911fb04 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: (40 commits) bonding/bond_main.c: make 2 functions static ps3: gigabit ethernet driver for PS3, take3 [netdrvr] Fix dependencies for ax88796 ne2k clone driver eHEA: Capability flag for DLPAR support Remove sk98lin ethernet driver. sunhme.c:quattro_pci_find() must be __devinit bonding / ipv6: no addrconf for slaves separately from master atl1: remove write-only var in tx handler macmace: use "unsigned long flags;" Cleanup usbnet_probe() return value handling netxen: deinline and sparse fix eeprom_93cx6: shorten pulse timing to match spec (bis) phylib: Add Marvell 88E1112 phy id phylib: cleanup marvell.c a bit AX88796 network driver IOC3: Switch to pci refcounting safe APIs e100: Fix Tyan motherboard e100 not receiving IPMI commands QE Ethernet driver writes to wrong register to mask interrupts rrunner.c:rr_init() must be __devinit tokenring/3c359.c:xl_init() must be __devinit ...		2007-07-10 14:56:22 -07:00
..
appletalk
arcnet	[ARCNET]: Use menuconfig objects.	2007-05-24 16:36:51 -07:00
arm	Use menuconfig objects II - netdev (general+100mbit)	2007-07-08 22:16:40 -04:00
atl1	atl1: remove write-only var in tx handler	2007-07-10 12:41:19 -04:00
bonding	bonding/bond_main.c: make 2 functions static	2007-07-10 14:31:45 -04:00
chelsio	network drivers: eliminate unneeded kill_vid code	2007-06-03 11:44:20 -04:00
cris
cxgb3	use is_power_of_2() in cxgb3/cxgb3_main.c	2007-07-10 12:22:30 -04:00
e1000	e1000: disable polling before registering netdevice	2007-06-03 11:44:20 -04:00
ehea	eHEA: Capability flag for DLPAR support	2007-07-10 12:59:41 -04:00
fec_8xx	Use menuconfig objects II - netdev (general+100mbit)	2007-07-08 22:16:40 -04:00
fs_enet	Use menuconfig objects II - netdev (general+100mbit)	2007-07-08 22:16:40 -04:00
hamradio
ibm_emac
irda	smsc-ircc2: bypass PNP detection until we get the quirks worked out	2007-07-01 12:29:44 -07:00
ixgb
ixp2000	potential compiler error, irqfunc caller sites update	2007-07-06 10:23:43 -07:00
mlx4	drivers/net: fix comparisons of unsigned < 0	2007-07-08 22:16:39 -04:00
myri10ge	Use is_power_of_2() in myri10ge/myri10ge.c	2007-07-10 12:22:30 -04:00
netxen	netxen: deinline and sparse fix	2007-07-10 12:41:09 -04:00
pcmcia	PCMCIA: add Socket Ethernet card into pcnet_cs	2007-07-10 12:24:03 -04:00
phy	phylib: Add Marvell 88E1112 phy id	2007-07-10 12:41:09 -04:00
skfp	potential parse error in ifdef	2007-06-01 08:18:27 -07:00
tokenring	tokenring/3c359.c:xl_init() must be __devinit	2007-07-10 12:24:42 -04:00
tulip	Use menuconfig objects II - netdev (general+100mbit)	2007-07-08 22:16:40 -04:00
usb	Cleanup usbnet_probe() return value handling	2007-07-10 12:41:18 -04:00
wan
wireless	[PATCH] hostap: Remove driver version number	2007-07-08 22:16:38 -04:00
3c59x.c	3cSOHO100-TX needs EXTRA_PREAMBLE	2007-07-10 12:22:30 -04:00
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	8139cp: Convert to generic boolean	2007-07-08 22:16:38 -04:00
8139too.c
8390.c
8390.h	AX88796 network driver	2007-07-10 12:41:08 -04:00
82596.c
a2065.c
a2065.h
ac3200.c
acenic_firmware.h
acenic.c	acenic: SET_NETDEV_DEV is always there these days	2007-07-08 22:16:40 -04:00
acenic.h	network drivers: eliminate unneeded kill_vid code	2007-06-03 11:44:20 -04:00
amd8111e.c	network drivers: eliminate unneeded kill_vid code	2007-06-03 11:44:20 -04:00
amd8111e.h	potential parse error in ifdef	2007-06-01 08:18:27 -07:00
apne.c
ariadne.c
ariadne.h
at1700.c
atari_bionet.c
atari_pamsnet.c	atari_pamsnet.c: old declaration ritchie style fix	2007-07-10 12:22:30 -04:00
atarilance.c
atp.c
atp.h
au1000_eth.c	au1000_eth: Fix warnings.	2007-06-27 02:33:06 -04:00
au1000_eth.h
ax88796.c	AX88796 network driver	2007-07-10 12:41:08 -04:00
b44.c	b44: use netdev_alloc_skb	2007-07-08 22:16:40 -04:00
b44.h	b44: packet offset is constant	2007-07-08 22:16:40 -04:00
bmac.c
bmac.h
bnx2_fw2.h
bnx2_fw.h
bnx2.c	[BNX2]: Update version and reldate.	2007-06-07 13:38:40 -07:00
bnx2.h	[BNX2]: Enable DMA on 5709.	2007-06-07 13:38:38 -07:00
bsd_comp.c
cassini.c	[CASSINI]: Fix printk message typo.	2007-05-31 01:23:22 -07:00
cassini.h
cs89x0.c
cs89x0.h
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c	defxx: Fix the handling of ioremap() failures	2007-05-30 09:52:48 -04:00
defxx.h
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 Tyan motherboard e100 not receiving IPMI commands	2007-07-10 12:24:43 -04: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.c
fec.h
forcedeth.c	forcedeth: use unicast receive mode for WoL	2007-06-20 19:15:04 -04:00
gianfar_ethtool.c
gianfar_mii.c	gianfar: add support for SGMII	2007-07-08 22:16:38 -04:00
gianfar_mii.h
gianfar_sysfs.c
gianfar.c	gianfar: add support for SGMII	2007-07-08 22:16:38 -04:00
gianfar.h	gianfar: add support for SGMII	2007-07-08 22:16:38 -04:00
hamachi.c
hp100.c	net/hp100: fix section mismatch warning	2007-06-01 08:18:30 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	ibmveth: Automatically enable larger rx buffer pools for larger mtu	2007-06-09 18:25:34 -04:00
ibmveth.h
ifb.c
ioc3-eth.c	IOC3: Switch to pci refcounting safe APIs	2007-07-10 12:29:24 -04:00
isa-skeleton.c
iseries_veth.c
jazzsonic.c
Kconfig	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2007-07-10 14:56:22 -07:00
lance.c
lasi_82596.c	Extract chip specific code out of lasi_82596.c	2007-07-08 22:16:45 -04:00
lib8390.c
lib82596.c	Extract chip specific code out of lasi_82596.c	2007-07-08 22:16:45 -04:00
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c	macmace: use "unsigned long flags;"	2007-07-10 12:41:18 -04:00
macsonic.c
Makefile	ps3: gigabit ethernet driver for PS3, take3	2007-07-10 14:13:46 -04:00
meth.c	meth driver renovation	2007-05-24 17:20:49 -04:00
meth.h
mii.c
mipsnet.c	[MIPS] Don't drag a platform specific header into generic arch code.	2007-06-20 22:27:10 +01:00
mipsnet.h
mv643xx_eth.c
mv643xx_eth.h
mvme147.c
myri_code.h
myri_sbus.c
myri_sbus.h
natsemi.c	natsemi irq flags	2007-06-20 19:15:04 -04: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	drivers/net/ns83820.c: fix a check-after-use	2007-07-02 08:24:52 -04:00
pasemi_mac.c	pasemi_mac: Fix TX interrupt threshold	2007-07-08 22:16:45 -04:00
pasemi_mac.h
pci-skeleton.c
pcnet32.c
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c	[PPP]: Fix osize too small errors when decoding mppe.	2007-06-23 23:05:54 -07:00
ppp_mppe.c	[PPP]: Revert 606f585e36	2007-06-23 23:04:11 -07:00
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppox.c
ps3_gelic_net.c	ps3: gigabit ethernet driver for PS3, take3	2007-07-10 14:13:46 -04:00
ps3_gelic_net.h	ps3: gigabit ethernet driver for PS3, take3	2007-07-10 14:13:46 -04:00
qla3xxx.c	qla3xxx: cleanup checksum offload code	2007-07-08 22:16:40 -04:00
qla3xxx.h
r8169.c	r8169: perform RX config change after mac filtering	2007-07-08 22:16:45 -04:00
rionet.c
rrunner.c	rrunner.c:rr_init() must be __devinit	2007-07-10 12:24:42 -04:00
rrunner.h
s2io-regs.h
s2io.c	Fix typo in drivers/net/s2io.c	2007-07-10 12:24:42 -04:00
s2io.h	s2io: add PCI error recovery support	2007-07-08 22:16:38 -04:00
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c	potential compiler error, irqfunc caller sites update	2007-07-06 10:23:43 -07:00
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
shaper.c
sis190.c
sis900.c	sis900_mii_probe() must be __devinit	2007-07-10 12:24:42 -04:00
sis900.h
skge.c
skge.h
sky2.c	sky2: 1.16 version	2007-07-10 12:22:30 -04:00
sky2.h	sky2: debug interface	2007-07-10 12:22:28 -04:00
slhc.c
slip.c
slip.h
smc91x.c
smc91x.h	Blackfin SMC91X ethernet supporting driver: SMC91C111 LEDs are note drived in the kernel like in uboot	2007-06-11 17:44:14 +08:00
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
sni_82596.c	Ethernet driver for EISA only SNI RM200/RM400 machines	2007-07-08 22:16:46 -04:00
sonic.c
sonic.h
Space.c
spider_net_ethtool.c	spidernet: checksum and ethtool	2007-06-20 19:09:33 -04:00
spider_net.c	spidernet: improve interrupt handling	2007-07-10 12:22:30 -04:00
spider_net.h	spidernet: Replace literal with const	2007-07-08 22:16:45 -04:00
starfire_firmware.h
starfire_firmware.pl
starfire.c	starfire list alpha as 64 bit arch	2007-07-02 08:24:51 -04:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c	sunhme.c:quattro_pci_find() must be __devinit	2007-07-10 12:45:29 -04:00
sunhme.h
sunlance.c
sunqe.c
sunqe.h
tc35815.c	[MIPS] tc35815: Load MAC address via platform_device	2007-07-10 17:33:04 +01:00
tg3.c	[TG3]: Fix link problem on Dell's onboard 5906.	2007-06-03 18:08:41 -07:00
tg3.h
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c
typhoon-firmware.h
typhoon.c	network drivers: eliminate unneeded kill_vid code	2007-06-03 11:44:20 -04:00
typhoon.h
ucc_geth_mii.c	ucc_geth: Fix MODULE_DEVICE_TABLE() duplication	2007-05-24 17:20:48 -04:00
ucc_geth_mii.h
ucc_geth.c	QE Ethernet driver writes to wrong register to mask interrupts	2007-07-10 12:24:42 -04:00
ucc_geth.h
via-rhine.c
via-velocity.c	typo in via-velocity.c	2007-06-09 18:25:34 -04:00
via-velocity.h
wd.c
yellowfin.c
znet.c
zorro8390.c