Linus Torvalds 5fbbf5f648 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (84 commits) wimax: fix kernel-doc for debufs_dentry member of struct wimax_dev net: convert pegasus driver to net_device_ops bnx2x: Prevent eeprom set when driver is down net: switch kaweth driver to netdevops pcnet32: round off carrier watch timer i2400m/usb: wrap USB power saving in #ifdef CONFIG_PM wimax: testing for rfkill support should also test for CONFIG_RFKILL_MODULE wimax: fix kconfig interactions with rfkill and input layers wimax: fix '#ifndef CONFIG_BUG' layout to avoid warning r6040: bump release number to 0.20 r6040: warn about MAC address being unset r6040: check PHY status when bringing interface up r6040: make printks consistent with DRV_NAME gianfar: Fixup use of BUS_ID_SIZE mlx4_en: Returning real Max in get_ringparam mlx4_en: Consider inline packets on completion netdev: bfin_mac: enable bfin_mac net dev driver for BF51x qeth: convert to net_device_ops vlan: add neigh_setup dm9601: warn on invalid mac address ...		2009-01-08 14:25:41 -08:00
..
appletalk	appletalk: convert ipddp to net_device_ops	2009-01-07 17:22:19 -08:00
arcnet
arm
atl1e
atlx
bonding	bonding: use net_device_ops	2009-01-06 10:41:56 -08:00
can
chelsio
cris
cxgb3
e1000	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
e1000e	resource: allow MMIO exclusivity for device drivers	2009-01-07 11:12:32 -08:00
ehea	net/ehea: use consistant type	2009-01-06 10:47:16 -08:00
enic
fs_enet
hamradio
ibm_newemac
igb	igb: fix anoying type mismatch warning on rx/tx queue sizing	2009-01-05 18:47:12 -08:00
irda	irda: convert to internal stats	2009-01-06 10:40:43 -08:00
ixgb
ixgbe
ixp2000
mlx4	mlx4_en: Returning real Max in get_ringparam	2009-01-08 10:57:37 -08:00
myri10ge	myri10ge: print MAC and serial number on probe failure	2009-01-05 18:16:14 -08:00
netxen
pcmcia
phy
qlge	qlge: Fix sparse warnings for tx ring indexes.	2009-01-05 18:19:59 -08:00
sfc	net: sfc: Use pci_clear_master() to disable bus mastering	2009-01-07 11:13:24 -08:00
skfp
tokenring	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
tulip	windbond: convert devices to new API	2009-01-07 18:02:26 -08:00
usb	net: convert pegasus driver to net_device_ops	2009-01-08 11:22:25 -08:00
wan
wimax	i2400m/usb: wrap USB power saving in #ifdef CONFIG_PM	2009-01-08 11:08:25 -08:00
wireless	fix similar typos to successfull	2009-01-08 08:31:15 -08: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
8390p.c
82596.c
a2065.c
a2065.h
ac3200.c
acenic.c	firmware: convert acenic driver to request_firmware()	2009-01-04 16:10:02 -08:00
acenic.h	firmware: convert acenic driver to request_firmware()	2009-01-04 16:10:02 -08:00
amd8111e.c	amd8111e: convert to net_device_ops	2009-01-07 18:09:58 -08:00
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c	atp: convert to net_device_ops	2009-01-07 18:10:24 -08:00
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c
b44.c	b44: convert to net_device_ops	2009-01-07 18:10:49 -08:00
b44.h
bfin_mac.c
bfin_mac.h
bmac.c
bmac.h
bnx2_fw2.h
bnx2_fw.h
bnx2.c
bnx2.h
bnx2x_fw_defs.h
bnx2x_hsi.h
bnx2x_init_values.h
bnx2x_init.h
bnx2x_link.c	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
bnx2x_link.h
bnx2x_main.c	bnx2x: Prevent eeprom set when driver is down	2009-01-08 11:21:43 -08:00
bnx2x_reg.h
bnx2x.h
bsd_comp.c
cassini.c	cassini: update to net_device_ops	2009-01-07 17:25:41 -08:00
cassini.h
cpmac.c
cs89x0.c
cs89x0.h
de600.c	de600: update to net_device_ops	2009-01-07 17:34:36 -08:00
de600.h
de620.c	de600: update to net_device_ops	2009-01-07 17:34:36 -08:00
de620.h
declance.c
defxx.c
defxx.h
depca.c
depca.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dummy.c
e100.c	firmware: convert e100 driver to request_firmware()	2009-01-07 12:59:17 -08:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c	enc28j60: update to net_device_ops	2009-01-07 17:30:09 -08:00
epic100.c	epic100: update to net_device_ops	2009-01-07 17:27:39 -08:00
eql.c
es3210.c
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c	fealnx: update to net_device_ops	2009-01-07 17:57:47 -08:00
fec_mpc52xx_phy.c
fec_mpc52xx.c
fec_mpc52xx.h
fec.c
fec.h
forcedeth.c
gianfar_ethtool.c
gianfar_mii.c
gianfar_mii.h
gianfar_sysfs.c
gianfar.c	gianfar: Fixup use of BUS_ID_SIZE	2009-01-08 10:58:38 -08:00
gianfar.h
hamachi.c
hp100.c	hp100: update to net_device_ops	2009-01-07 18:13:49 -08:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	ibmveth: use consistent types	2009-01-06 10:47:44 -08:00
ibmveth.h	ibmveth: use consistent types	2009-01-06 10:47:44 -08:00
ifb.c
ioc3-eth.c
ipg.c	ipg: update to net_device_ops	2009-01-07 17:26:14 -08:00
ipg.h
isa-skeleton.c
iseries_veth.c
jazzsonic.c
jme.c
jme.h
Kconfig	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-01-08 11:05:59 -08:00
korina.c
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	i2400m: Makefile and Kconfig	2009-01-07 10:00:22 -08:00
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c
mvme147.c
myri_code.h
myri_sbus.c
myri_sbus.h
natsemi.c	natsemi: update to net_device_ops	2009-01-07 17:57:19 -08: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
niu.c
niu.h
ns83820.c	ns83820: fix net_device_ops support	2009-01-07 17:36:07 -08:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c	pcnet32: round off carrier watch timer	2009-01-08 11:17:13 -08:00
plip.c	plip: update to net_device_ops	2009-01-07 17:26:48 -08:00
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
ps3_gelic_wireless.c
ps3_gelic_wireless.h
qla3xxx.c
qla3xxx.h
r6040.c	r6040: bump release number to 0.20	2009-01-08 11:03:57 -08:00
r8169.c
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c
s2io.h
sb1000.c	sb1000: update to net_device_ops	2009-01-07 17:56:54 -08:00
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c
sh_eth.h
sis190.c	sis190: update to net_device_ops	2009-01-07 17:35:41 -08:00
sis900.c
sis900.h
skge.c
skge.h
sky2.c
sky2.h
slhc.c
slip.c	slip: convert to net_device_ops	2009-01-07 18:09:36 -08:00
slip.h	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
smc91x.c
smc91x.h
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c	starfire: update to net_device_ops	2009-01-07 17:58:17 -08:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c	sundance: update to net_device_ops	2009-01-07 17:58:43 -08:00
sungem_phy.c
sungem_phy.h
sungem.c	sungem: update to net_device_ops	2009-01-07 17:28:54 -08:00
sungem.h
sunhme.c	sunhme: update to net_device_ops	2009-01-07 17:28:35 -08:00
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c	sparc64: Fix unsigned long long warnings in drivers.	2009-01-06 13:20:38 -08:00
sunvnet.h
tc35815.c
tehuti_fw.h
tehuti.c	trivial: fix then -> than typos in comments and documentation	2009-01-06 11:28:06 +01:00
tehuti.h
tg3.c	firmware: convert tg3 driver to request_firmware()	2009-01-04 16:11:25 -08:00
tg3.h	firmware: convert tg3 driver to request_firmware()	2009-01-04 16:11:25 -08:00
tlan.c	tlan: update to net_device_ops	2009-01-07 17:27:15 -08:00
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	tun: Eliminate sparse signedness warning	2009-01-04 17:14:46 -08:00
typhoon-firmware.h
typhoon.c	typhoon: update to net_device_ops	2009-01-07 17:29:46 -08:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth_mii.c
ucc_geth_mii.h
ucc_geth.c
ucc_geth.h
veth.c
via-rhine.c
via-velocity.c
via-velocity.h
virtio_net.c	virtio: convert to net_device_ops	2009-01-06 10:44:22 -08:00
wd.c
xen-netfront.c	xen-netfront: convert to net_device_ops	2009-01-06 10:44:55 -08:00
xtsonic.c
yellowfin.c
znet.c
zorro8390.c