Linus Torvalds c44eaf41a5 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: (34 commits) net: Add support for SMSC LAN9530, LAN9730 and LAN89530 mlx4_en: Restoring RX buffer pointer in case of failure mlx4: Sensing link type at device initialization ipv4: Fix "Set rt->rt_iif more sanely on output routes." MAINTAINERS: add entry for Xen network backend be2net: Fix suspend/resume operation be2net: Rename some struct members for clarity pppoe: drop PPPOX_ZOMBIEs in pppoe_flush_dev dsa/mv88e6131: add support for mv88e6085 switch ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2) be2net: Fix a potential crash during shutdown. bna: Fix for handling firmware heartbeat failure can: mcp251x: Allow pass IRQ flags through platform data. smsc911x: fix mac_lock acquision before calling smsc911x_mac_read iwlwifi: accept EEPROM version 0x423 for iwl6000 rt2x00: fix cancelling uninitialized work rtlwifi: Fix some warnings/bugs p54usb: IDs for two new devices wl12xx: fix potential buffer overflow in testmode nvs push zd1211rw: reset rx idle timer from tasklet ...		2011-04-11 07:27:24 -07:00
..
appletalk	appletalk: remove the BKL	2011-03-05 10:55:57 +01:00
arcnet
arm	module: fix missing semicolons in MODULE macro usage	2011-01-24 14:32:54 +10:30
atl1c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
atl1e	Fix common misspellings	2011-03-31 11:26:23 -03:00
atlx	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
benet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
bna	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
bnx2x	Fix common misspellings	2011-03-31 11:26:23 -03:00
bonding	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
caif	Fix common misspellings	2011-03-31 11:26:23 -03:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
chelsio	Fix common misspellings	2011-03-31 11:26:23 -03:00
cris	Fix common misspellings	2011-03-31 11:26:23 -03:00
cxgb3	Fix common misspellings	2011-03-31 11:26:23 -03:00
cxgb4	Fix common misspellings	2011-03-31 11:26:23 -03:00
cxgb4vf	Fix common misspellings	2011-03-31 11:26:23 -03:00
e1000	Fix common misspellings	2011-03-31 11:26:23 -03:00
e1000e	Fix common misspellings	2011-03-31 11:26:23 -03:00
ehea	ehea: Increase the skb array usage	2011-01-11 14:03:09 -08:00
enic	enic: Support newer version of firmware devcmd CMD_MCPU_FW_INFO	2011-03-14 14:49:29 -07:00
fs_enet	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
hamradio	Fix common misspellings	2011-03-31 11:26:23 -03:00
ibm_newemac	Fix common misspellings	2011-03-31 11:26:23 -03:00
igb	Fix common misspellings	2011-03-31 11:26:23 -03:00
igbvf	Fix common misspellings	2011-03-31 11:26:23 -03:00
irda	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
ixgb	ixgb: convert to new VLAN model	2011-03-11 01:16:23 -08:00
ixgbe	Fix common misspellings	2011-03-31 11:26:23 -03:00
ixgbevf	Fix common misspellings	2011-03-31 11:26:23 -03:00
ixp2000
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
myri10ge	Fix common misspellings	2011-03-31 11:26:23 -03:00
netxen	Fix common misspellings	2011-03-31 11:26:23 -03:00
octeon
pch_gbe	Fix common misspellings	2011-03-31 11:26:23 -03:00
pcmcia	Fix common misspellings	2011-03-31 11:26:23 -03:00
phy	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
qlcnic	net: fix ethtool->set_flags not intended -EINVAL return value	2011-03-27 23:35:24 -07:00
qlge	Fix common misspellings	2011-03-31 11:26:23 -03:00
sfc	Fix common misspellings	2011-03-31 11:26:23 -03:00
skfp	Fix common misspellings	2011-03-31 11:26:23 -03:00
stmmac	Fix common misspellings	2011-03-31 11:26:23 -03:00
tile	tile on-chip network driver: sync up with latest fixes	2011-03-10 13:18:12 -05:00
tokenring	Fix common misspellings	2011-03-31 11:26:23 -03:00
tulip	Fix common misspellings	2011-03-31 11:26:23 -03:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
vmxnet3	Fix common misspellings	2011-03-31 11:26:23 -03:00
vxge	Fix common misspellings	2011-03-31 11:26:23 -03:00
wan	Fix common misspellings	2011-03-31 11:26:23 -03:00
wimax	Fix common misspellings	2011-03-31 11:26:23 -03:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
xen-netback	xen network backend driver	2011-03-15 19:38:03 -07:00
3c59x.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
3c501.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
3c523.h
3c527.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
3c527.h
7990.c
7990.h
8139cp.c
8139too.c
8390.c
8390.h
8390p.c
82596.c
a2065.c	drivers/net/a2065.c: Convert release_resource to release_region/release_mem_region	2011-03-23 14:10:37 -07:00
a2065.h
ac3200.c
acenic.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
acenic.h
amd8111e.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
amd8111e.h
apne.c
ariadne.c	drivers/net/ariadne.c: Convert release_resource to release_region/release_mem_region	2011-03-23 14:10:36 -07:00
ariadne.h
at1700.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
atarilance.c
atp.c
atp.h
au1000_eth.c
au1000_eth.h
ax88796.c	ax88796: use generic mdio_bitbang driver	2011-02-21 13:49:48 +01:00
b44.c
b44.h
bcm63xx_enet.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
bcm63xx_enet.h
bfin_mac.c	netdev: bfin_mac: document TE setting in RMII modes	2011-03-28 22:26:34 -07:00
bfin_mac.h	netdev: bfin_mac: let boards set vlan masks	2011-01-10 13:31:14 -08:00
bmac.c
bmac.h
bnx2_fw.h
bnx2.c	drivers net: Fix declaration ordering in inline functions.	2011-03-28 22:26:34 -07:00
bnx2.h	bnx2: Update firmware and version	2011-03-14 15:00:12 -07:00
bsd_comp.c
cassini.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
cassini.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
cnic_defs.h	cnic: Add FCoE support on 57712	2010-12-23 11:44:34 -08:00
cnic_if.h	bnx2x, cnic: Consolidate iSCSI/FCoE shared mem logic in bnx2x	2011-01-31 20:44:46 -08:00
cnic.c	ipv6: Convert to use flowi6 where applicable.	2011-03-12 15:08:54 -08:00
cnic.h	drivers/net: remove some rcu sparse warnings	2011-01-27 15:02:57 -08:00
cpmac.c
cs89x0.c	CS89x0: Add networking support for QQ2440	2011-03-14 16:49:28 -07:00
cs89x0.h
davinci_cpdma.c	net: davinci_emac:Fix translation logic for buffer descriptor	2011-03-22 19:25:05 -07:00
davinci_cpdma.h	net: davinci_emac:Fix translation logic for buffer descriptor	2011-03-22 19:25:05 -07:00
davinci_emac.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
davinci_mdio.c
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c	depca: Fix warnings	2011-02-01 13:19:07 -08:00
depca.h
dl2k.c	dl2k: nulify fraginfo after unmap	2011-01-27 14:18:34 -08:00
dl2k.h
dm9000.c	drivers: Final irq namespace conversion	2011-03-29 14:48:19 +02:00
dm9000.h
dnet.c	dnet: fix wrong use of platform_set_drvdata()	2011-02-28 12:22:21 -08:00
dnet.h
dummy.c
e100.c
e2100.c
eepro.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
eexpress.c
eexpress.h
enc28j60_hw.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
enc28j60.c	enc28j60: Fix reading of transmit status vector	2011-01-31 20:56:54 -08:00
epic100.c	epic100: hamachi: yellowfin: Fix skb allocation size	2010-12-25 19:37:49 -08:00
eql.c	eql: Convert printks to pr_<level> and netdev_<level>	2011-03-03 13:30:20 -08:00
es3210.c
eth16i.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ethoc.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
fec_mpc52xx.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
fec_mpc52xx.h	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
fec.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-03 21:27:42 -08:00
fec.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
forcedeth.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
fsl_pq_mdio.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
fsl_pq_mdio.h
ftmac100.c	ftmac100: use resource_size()	2011-03-18 21:53:03 -07:00
ftmac100.h	net: add Faraday FTMAC100 10/100 Ethernet driver	2011-03-03 12:19:11 -08:00
gianfar_ethtool.c
gianfar_sysfs.c
gianfar.c	gianfar: Fall back to software tcp/udp checksum on older controllers	2011-03-18 15:12:14 -07:00
gianfar.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
greth.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
greth.h	GRETH: handle frame error interrupts	2011-01-14 12:45:54 -08:00
hamachi.c	epic100: hamachi: yellowfin: Fix skb allocation size	2010-12-25 19:37:49 -08:00
hp100.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
hp100.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ibmlana.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
ibmveth.c
ibmveth.h
ifb.c	ifb: add performance flags	2011-01-03 12:43:10 -08:00
ioc3-eth.c
ipg.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ipg.h
iseries_veth.c
jazzsonic.c
jme.c	Net / jme: Do not use legacy PCI power management	2011-03-27 23:35:04 -07:00
jme.h	jme: Advance driver version	2011-02-13 21:44:44 -08:00
Kconfig	e1000e: fix kconfig for crc32 dependency	2011-03-16 11:14:38 -07:00
korina.c
ks8842.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ks8851_mll.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ks8851.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ks8851.h
ksz884x.c	net: use CHECKSUM_NONE instead of magic number	2011-03-27 23:35:05 -07:00
lance.c
lasi_82596.c
lib8390.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
lib82596.c
LICENSE.SRC
ll_temac_main.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c	loopback: convert to hw_features	2011-02-17 14:16:35 -08:00
lp486e.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
mac89x0.c
mac8390.c
macb.c	macb: don't use platform_set_drvdata() on a net_device	2011-02-28 12:22:20 -08:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c	macvlan: Fix use after free of struct macvlan_port.	2011-03-21 18:22:22 -07:00
macvtap.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2011-03-10 14:26:00 -08:00
Makefile	xen network backend driver	2011-03-15 19:38:03 -07:00
mdio.c
meth.c
meth.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
mii.c	mii: Convert printks to netdev_info	2011-03-03 13:02:32 -08:00
mipsnet.c
mv643xx_eth.c	mv643xx_eth: Use netdev_<level> and pr_<level>	2011-03-03 13:02:31 -08:00
mvme147.c
myri_sbus.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
myri_sbus.h
natsemi.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c	netconsole: clarify stopping message	2011-01-06 11:30:23 -08:00
netx-eth.c
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	niu: Rename NIU parent platform device name to fix conflict.	2011-03-19 23:06:33 -07:00
niu.h
ns83820.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
pcnet32.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
plip.c
ppp_async.c	net: ppp: use {get,put}_unaligned_be{16,32}	2011-01-10 16:13:33 -08:00
ppp_deflate.c	zlib: slim down zlib_deflate() workspace when possible	2011-03-22 17:44:17 -07:00
ppp_generic.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ppp_mppe.c	net: ppp: use {get,put}_unaligned_be{16,32}	2011-01-10 16:13:33 -08:00
ppp_mppe.h
ppp_synctty.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
pppoe.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
pppox.c
pptp.c	ipv4: Create and use route lookup helpers.	2011-03-12 15:08:42 -08:00
ps3_gelic_net.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ps3_gelic_net.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
ps3_gelic_wireless.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
ps3_gelic_wireless.h
pxa168_eth.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
qla3xxx.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
qla3xxx.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
r6040.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
r8169.c	r8169: fix a bug in rtl8169_init_phy()	2011-03-20 17:33:19 -07:00
rionet.c	rapidio: modify subsystem and driver initialization sequence	2011-03-23 19:46:42 -07:00
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
s2io.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
s6gmac.c
sb1000.c
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sgiseeq.h
sh_eth.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sh_eth.h	net: sh_eth: modify the PHY_INTERFACE_MODE	2011-03-14 14:10:15 -07:00
sis190.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sis900.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sis900.h
skge.c	skge: don't mark carrier down at start	2011-02-24 22:17:02 -08:00
skge.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
sky2.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sky2.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
slhc.c
slip.c
slip.h
smc91x.c	smc91x: add devicetree support	2011-01-25 22:41:55 -08:00
smc91x.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-04-11 07:27:24 -07:00
smsc911x.h
smsc9420.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c	net/Space: delete orphaned externs from deleted drivers	2011-01-03 11:06:35 -08:00
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c	starfire: clean up dma_addr_t size test	2011-04-01 20:10:08 -07:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
sunbmac.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
sundance.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-12-26 22:37:05 -08:00
sungem_phy.c
sungem_phy.h
sungem.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sungem.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-03-18 10:37:40 -07:00
sunhme.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
sunhme.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
sunlance.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
sunqe.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
tehuti.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
tehuti.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
tg3.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
tg3.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
tlan.c	tlan: Use pr_fmt, pr_<level> and netdev_<level>	2011-03-03 13:02:31 -08:00
tlan.h	tlan: Code cleanup: checkpatch.pl is relatively happy now.	2011-01-24 15:07:06 -08:00
tsi108_eth.c
tsi108_eth.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
tun.c	tun: Convert logging messages to pr_<level> and tun_debug	2011-03-03 12:21:14 -08:00
typhoon.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c	dt/net: Eliminate users of of_platform_{,un}register_driver	2011-02-28 13:22:44 -07:00
ucc_geth.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
veth.c	veth: Fix the byte counters	2011-03-21 18:24:53 -07:00
via-rhine.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
via-velocity.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
via-velocity.h	via-velocity: fix the WOL bug on 1000M full duplex forced mode.	2011-01-20 16:59:33 -08:00
virtio_net.c	virtio_net: Add schedule check to napi_enable call	2011-02-10 11:03:31 -08:00
wd.c
xen-netfront.c	xen network backend driver	2011-03-15 19:38:03 -07:00
xilinx_emaclite.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
xtsonic.c
yellowfin.c	epic100: hamachi: yellowfin: Fix skb allocation size	2010-12-25 19:37:49 -08:00
znet.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
zorro8390.c