Linus Torvalds 597d8c7178 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: (56 commits) sky2: Fix oops in sky2_xmit_frame() after TX timeout Documentation/3c509: document ethtool support af_packet: Don't use skb after dev_queue_xmit() vxge: use pci_dma_mapping_error to test return value netfilter: ebtables: enforce CAP_NET_ADMIN e1000e: fix and commonize code for setting the receive address registers e1000e: e1000e_enable_tx_pkt_filtering() returns wrong value e1000e: perform 10/100 adaptive IFS only on parts that support it e1000e: don't accumulate PHY statistics on PHY read failure e1000e: call pci_save_state() after pci_restore_state() netxen: update version to 4.0.72 netxen: fix set mac addr netxen: fix smatch warning netxen: fix tx ring memory leak tcp: update the netstamp_needed counter when cloning sockets TI DaVinci EMAC: Handle emac module clock correctly. dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips ixgbe: Fix compiler warning about variable being used uninitialized netfilter: nf_ct_ftp: fix out of bounds read in update_nl_seq() mv643xx_eth: don't include cache padding in rx desc buffer size ... Fix trivial conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c		2010-01-12 20:53:29 -08:00
..
appletalk	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
arcnet	…
arm	ARM: 5865/1: nuc900 ethernet driver needs mii	2010-01-05 20:53:07 +00:00
atl1c	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-11 17:12:17 -08:00
atl1e	…
atlx	NET: atlx, fix memory leak	2010-01-07 01:07:30 -08:00
benet	be2net: Bug fix to return correct values in ethtool get_settings.	2009-12-23 20:58:14 -08:00
bonding	bond_3ad.c avoid possible null deref	2009-12-26 20:24:46 -08:00
can	drivers/net/can: Correct NULL test	2010-01-03 21:42:49 -08:00
chelsio	…
cris	…
cxgb3	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-11 17:12:17 -08:00
e1000	…
e1000e	e1000e: fix and commonize code for setting the receive address registers	2010-01-08 00:35:31 -08:00
ehea	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
enic	…
fs_enet	…
hamradio	hamradio: avoid null deref v3	2010-01-03 21:42:50 -08:00
ibm_newemac	…
igb	igb: check both function bits in status register in wol exception	2009-12-23 20:47:51 -08:00
igbvf	igbvf: Make igbvf error message more informative	2009-12-23 20:47:51 -08:00
irda	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
ixgb	…
ixgbe	ixgbe: Fix compiler warning about variable being used uninitialized	2010-01-07 17:27:30 -08:00
ixp2000	…
mlx4	mlx4_core: Fix cleanup in __mlx4_init_one() error path	2010-01-06 12:54:39 -08:00
myri10ge	myri10ge: use src+dst for rss hashing	2009-12-08 20:24:35 -08:00
netxen	netxen: update version to 4.0.72	2010-01-08 00:35:28 -08:00
octeon	NET: Add Ethernet driver for Octeon MGMT devices.	2009-12-17 01:56:59 +00:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
qlge	…
sfc	sfc: Disable TX descriptor prefetch watchdog	2009-12-23 19:09:08 -08:00
skfp	…
stmmac	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
tokenring	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
tulip	dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips	2010-01-07 17:27:31 -08:00
usb	hso: fixed missing newlines	2010-01-07 00:43:47 -08:00
vmxnet3	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
vxge	vxge: use pci_dma_mapping_error to test return value	2010-01-10 13:40:10 -08:00
wan	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
wimax	USB: remove the auto_pm flag	2009-12-11 11:55:21 -08:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-30 12:37:35 -08:00
3c59x.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
3c501.c	…
3c501.h	…
3c503.c	…
3c503.h	…
3c505.c	…
3c505.h	…
3c507.c	Fix MAC address access in 3c507, ibmlana, pcnet32 and libertas	2009-12-26 20:24:45 -08:00
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	…
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-30 12:37:35 -08:00
LICENSE.SRC	…
Makefile	NET: Add Ethernet driver for Octeon MGMT devices.	2009-12-17 01:56:59 +00:00
Space.c	…
a2065.c	…
a2065.h	…
ac3200.c	…
acenic.c	…
acenic.h	…
amd8111e.c	…
amd8111e.h	…
apne.c	…
ariadne.c	…
ariadne.h	…
at1700.c	…
atarilance.c	atarilance: timeout ignored in lance_open()	2010-01-03 21:42:52 -08:00
atp.c	…
atp.h	…
au1000_eth.c	…
au1000_eth.h	…
ax88796.c	…
b44.c	b44 WOL setup: one-bit-off stack corruption kernel panic fix	2009-12-08 21:00:22 -08:00
b44.h	…
bcm63xx_enet.c	bcm63xx_enet: fix compilation failure after get_stats_count removal	2009-12-15 21:12:22 -08:00
bcm63xx_enet.h	…
bfin_mac.c	…
bfin_mac.h	…
bmac.c	…
bmac.h	…
bnx2.c	bnx2: Fix bnx2_netif_stop() merge error.	2009-12-20 18:40:18 -08:00
bnx2.h	…
bnx2_fw.h	…
bnx2x.h	…
bnx2x_dump.h	…
bnx2x_fw_defs.h	…
bnx2x_fw_file_hdr.h	…
bnx2x_hsi.h	…
bnx2x_init.h	…
bnx2x_init_ops.h	…
bnx2x_link.c	…
bnx2x_link.h	…
bnx2x_main.c	bnx2x: Initialize cnic status block during chip reset	2009-12-25 17:13:07 -08:00
bnx2x_reg.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
bsd_comp.c	…
cassini.c	…
cassini.h	…
cnic.c	cnic: Zero out status block and Event Queue indices.	2009-12-11 15:07:55 -08:00
cnic.h	…
cnic_defs.h	…
cnic_if.h	…
cpmac.c	drivers/net/cpmac.c: Correct code taking the size of a pointer	2009-12-13 19:56:35 -08:00
cs89x0.c	cs89x0: Always report failure to request interrupt	2010-01-07 01:07:29 -08:00
cs89x0.h	…
davinci_emac.c	TI DaVinci EMAC: Handle emac module clock correctly.	2010-01-07 17:27:31 -08:00
de600.c	…
de600.h	…
de620.c	…
de620.h	…
declance.c	…
defxx.c	…
defxx.h	…
depca.c	…
depca.h	…
dl2k.c	…
dl2k.h	…
dm9000.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
dm9000.h	…
dnet.c	…
dnet.h	…
dummy.c	…
e100.c	e100: Fix broken cbs accounting due to missing memset.	2009-12-18 20:18:21 -08:00
e2100.c	…
eepro.c	…
eexpress.c	…
eexpress.h	…
enc28j60.c	…
enc28j60_hw.h	…
epic100.c	…
eql.c	…
es3210.c	…
eth16i.c	…
ethoc.c	…
ewrk3.c	…
ewrk3.h	…
fealnx.c	…
fec.c	…
fec.h	…
fec_mpc52xx.c	net/mpc5200: Fix locking on fec_mpc52xx driver	2009-12-08 20:29:10 -08:00
fec_mpc52xx.h	…
fec_mpc52xx_phy.c	…
forcedeth.c	…
fsl_pq_mdio.c	fsl_pq_mdio: Fix iomem unmapping for non-eTSEC2.0 controllers	2009-12-30 22:03:43 -08:00
fsl_pq_mdio.h	…
gianfar.c	gianfar: Fix gianfar select_queue bogosity	2009-12-26 20:24:44 -08:00
gianfar.h	gianfar: Fix bit definitions of IMASK_GRSC and IMASK_GTSC	2009-12-18 20:38:37 -08:00
gianfar_ethtool.c	…
gianfar_sysfs.c	…
hamachi.c	…
hp-plus.c	…
hp.c	…
hp100.c	…
hp100.h	…
hplance.c	…
hplance.h	…
hydra.c	…
ibmlana.c	Fix MAC address access in 3c507, ibmlana, pcnet32 and libertas	2009-12-26 20:24:45 -08:00
ibmlana.h	…
ibmveth.c	…
ibmveth.h	…
ifb.c	…
ioc3-eth.c	…
ipg.c	…
ipg.h	…
isa-skeleton.c	…
iseries_veth.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
jazzsonic.c	…
jme.c	…
jme.h	…
korina.c	…
ks8842.c	…
ks8851.c	…
ks8851.h	…
ks8851_mll.c	…
lance.c	…
lasi_82596.c	…
lib8390.c	…
lib82596.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
ll_temac.h	…
ll_temac_main.c	drivers/net : Correct the size argument to kzalloc	2010-01-03 21:42:51 -08:00
ll_temac_mdio.c	…
lne390.c	…
loopback.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
lp486e.c	…
mac89x0.c	…
mac8390.c	…
macb.c	…
macb.h	…
mace.c	…
mace.h	…
macmace.c	…
macsonic.c	…
macvlan.c	…
mdio.c	…
meth.c	…
meth.h	…
mii.c	…
mipsnet.c	…
mv643xx_eth.c	mv643xx_eth: don't include cache padding in rx desc buffer size	2010-01-07 01:11:10 -08:00
mvme147.c	…
myri_sbus.c	…
myri_sbus.h	…
natsemi.c	…
ne-h8300.c	…
ne.c	…
ne2.c	…
ne2k-pci.c	…
ne3210.c	…
netconsole.c	…
netx-eth.c	…
ni52.c	…
ni52.h	…
ni65.c	…
ni65.h	…
ni5010.c	…
ni5010.h	…
niu.c	niu: timeout ignored in tcam_wait_bit()	2010-01-03 21:42:52 -08:00
niu.h	…
ns83820.c	…
pasemi_mac.c	…
pasemi_mac.h	…
pasemi_mac_ethtool.c	…
pci-skeleton.c	…
pcnet32.c	Fix MAC address access in 3c507, ibmlana, pcnet32 and libertas	2009-12-26 20:24:45 -08:00
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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
ps3_gelic_net.h	…
ps3_gelic_wireless.c	…
ps3_gelic_wireless.h	…
qla3xxx.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
qla3xxx.h	…
r6040.c	…
r8169.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
rionet.c	…
rrunner.c	rrunner: fix buffer overflow	2010-01-03 22:06:15 -08:00
rrunner.h	…
s2io-regs.h	…
s2io.c	Merge branch 'for-next' into for-linus	2009-12-07 18:36:35 +01:00
s2io.h	…
s6gmac.c	…
sb1000.c	…
sb1250-mac.c	…
sc92031.c	…
seeq8005.c	…
seeq8005.h	…
sgiseeq.c	…
sgiseeq.h	…
sh_eth.c	net: Test off by one in sh_eth_reset()	2010-01-03 21:42:53 -08:00
sh_eth.h	…
sis190.c	…
sis900.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
sis900.h	…
skge.c	…
skge.h	…
sky2.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
sky2.h	…
slhc.c	…
slip.c	…
slip.h	…
smc-mca.c	…
smc-ultra.c	…
smc-ultra32.c	…
smc91x.c	net: smc91x: Fix up type mismatch in smc_drv_resume().	2009-12-11 15:07:54 -08:00
smc91x.h	smc91x: remove OMAP specific bits	2009-12-11 16:16:33 -08:00
smc911x.c	…
smc911x.h	…
smc9194.c	…
smc9194.h	…
smsc911x.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
smsc911x.h	…
smsc9420.c	…
smsc9420.h	…
sni_82596.c	…
sonic.c	…
sonic.h	…
spider_net.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
spider_net.h	…
spider_net_ethtool.c	…
starfire.c	…
stnic.c	…
sun3_82586.c	…
sun3_82586.h	…
sun3lance.c	…
sunbmac.c	…
sunbmac.h	…
sundance.c	…
sungem.c	…
sungem.h	…
sungem_phy.c	…
sungem_phy.h	…
sunhme.c	…
sunhme.h	…
sunlance.c	…
sunqe.c	…
sunqe.h	…
sunvnet.c	…
sunvnet.h	…
tc35815.c	…
tehuti.c	…
tehuti.h	…
tg3.c	…
tg3.h	…
tlan.c	…
tlan.h	…
tsi108_eth.c	…
tsi108_eth.h	…
tun.c	tun: use tun_sk instead container_of	2009-12-26 20:24:44 -08:00
typhoon.c	…
typhoon.h	…
ucc_geth.c	ucc_geth: Fix netdev watchdog triggering on suspend	2009-12-30 22:03:43 -08:00
ucc_geth.h	ucc_geth: Fix the wrong the Rx/Tx FIFO size	2010-01-06 20:32:38 -08:00
ucc_geth_ethtool.c	…
veth.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
via-rhine.c	net/via-rhine: Fix scheduling while atomic bugs	2009-12-23 21:54:29 -08:00
via-velocity.c	via-velocity: Give RX descriptors to the NIC later on open or MTU change	2010-01-03 21:18:40 -08:00
via-velocity.h	…
virtio_net.c	…
wd.c	…
xen-netfront.c	…
xilinx_emaclite.c	…
xtsonic.c	…
yellowfin.c	…
znet.c	…
zorro8390.c	…