Linus Torvalds 7d7dee96e1 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: (21 commits) dca: disable dca on IOAT ver.3.0 multiple-IOH platforms netpoll: Disable IRQ around RCU dereference in netpoll_rx sctp: Do not reset the packet during sctp_packet_config(). net/llc: storing negative error codes in unsigned short MAINTAINERS: move atlx discussions to netdev drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory drivers/net/eql.c: prevent reading uninitialized stack memory drivers/net/usb/hso.c: prevent reading uninitialized memory xfrm: dont assume rcu_read_lock in xfrm_output_one() r8169: Handle rxfifo errors on 8168 chips 3c59x: Remove atomic context inside vortex_{set|get}_wol tcp: Prevent overzealous packetization by SWS logic. net: RPS needs to depend upon USE_GENERIC_SMP_HELPERS phylib: fix PAL state machine restart on resume net: use rcu_barrier() in rollback_registered_many bonding: correctly process non-linear skbs ipv4: enable getsockopt() for IP_NODEFRAG ipv4: force_igmp_version ignored when a IGMPv3 query received ppp: potential NULL dereference in ppp_mp_explode() net/llc: make opt unsigned in llc_ui_setsockopt() ...		2010-09-19 11:05:50 -07:00
..
appletalk
arcnet
arm	Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6	2010-08-11 09:17:27 -07:00
atl1c
atl1e
atlx
benet	be2net: remove a BUG_ON in be_cmds.c	2010-09-03 09:52:47 -07:00
bnx2x	bnx2x: Update bnx2x version to 1.52.53-4	2010-08-18 23:42:36 -07:00
bonding	bonding: correctly process non-linear skbs	2010-09-14 14:25:32 -07:00
caif	caif-driver: add HAS_DMA dependency	2010-08-24 12:21:13 -07:00
can	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
chelsio
cris
cxgb3	drivers/net/cxgb3/cxgb3_main.c: prevent reading uninitialized stack memory	2010-09-16 21:55:00 -07:00
cxgb4	cxgb4: update driver version	2010-08-02 16:26:44 -07:00
cxgb4vf	cxgb4vf: do not use PCI resources before pci_enable_device()	2010-08-04 16:18:02 -07:00
e1000	e100/e1000*/igb*/ixgb*: Add missing read memory barrier	2010-08-08 20:02:45 -07:00
e1000e	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-23 18:30:30 -07:00
ehea	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-23 18:30:30 -07:00
enic	drivers/net/enic: Use %pUB to format a UUID	2010-08-04 16:18:04 -07:00
fs_enet	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
hamradio
ibm_newemac	Input: sysrq - drop tty argument from sysrq ops handlers	2010-08-19 22:07:06 -07:00
igb	e100/e1000*/igb*/ixgb*: Add missing read memory barrier	2010-08-08 20:02:45 -07:00
igbvf	e100/e1000*/igb*/ixgb*: Add missing read memory barrier	2010-08-08 20:02:45 -07:00
irda	Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable	2010-08-06 18:13:19 +01:00
ixgb	e100/e1000*/igb*/ixgb*: Add missing read memory barrier	2010-08-08 20:02:45 -07:00
ixgbe	e100/e1000*/igb*/ixgb*: Add missing read memory barrier	2010-08-08 20:02:45 -07:00
ixgbevf	e100/e1000*/igb*/ixgb*: Add missing read memory barrier	2010-08-08 20:02:45 -07:00
ixp2000
mlx4
myri10ge	param: lock myri10ge_fw_name against sysfs changes.	2010-08-11 23:04:32 +09:30
netxen	netxen: fix poll implementation	2010-08-23 20:28:55 -07:00
octeon
pcmcia	pcmcia pcnet_cs: try setting io_lines to 16 if card setup fails	2010-09-15 17:57:22 +02:00
phy	phylib: fix PAL state machine restart on resume	2010-09-14 14:31:03 -07:00
qlcnic	qlcnic: fix poll implementation	2010-08-23 20:28:55 -07:00
qlge	qlge: reset the chip before freeing the buffers	2010-08-26 14:09:14 -07:00
sfc
skfp
stmmac	stmmac: fix sleep inside atomic	2010-09-07 13:57:14 -07:00
tokenring
tulip	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
usb	drivers/net/usb/hso.c: prevent reading uninitialized memory	2010-09-16 21:54:59 -07:00
vmxnet3
vxge	drivers/net/vxge/vxge-main.c: Use pr_<level> and netdev_<level>	2010-07-30 23:27:57 -07:00
wan	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-13 10:38:12 -07:00
wimax	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-09-07 14:06:10 -07:00
3c59x.c	3c59x: Remove atomic context inside vortex_{set|get}_wol	2010-09-15 14:32:39 -07: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
8139too.c
8390.c
8390.h
8390p.c
82596.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
atp.c
atp.h
au1000_eth.c	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus	2010-08-05 08:53:20 -07:00
au1000_eth.h
ax88796.c
b44.c	PATCH: b44 Handle RX FIFO overflow better (simplified)	2010-09-07 13:57:23 -07:00
b44.h
bcm63xx_enet.c
bcm63xx_enet.h
bfin_mac.c
bfin_mac.h
bmac.c
bmac.h
bnx2_fw.h
bnx2.c
bnx2.h
bsd_comp.c
cassini.c
cassini.h
cnic_defs.h
cnic_if.h
cnic.c	bnx2x: Create separate folder for bnx2x driver	2010-07-27 20:35:39 -07:00
cnic.h
cpmac.c
cs89x0.c
cs89x0.h
davinci_emac.c	davinci_emac: Fix use after free in davinci_emac_remove	2010-08-04 16:18:03 -07: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
dm9000.h
dnet.c	dnet: fixup error handling in initialization	2010-07-30 23:27:58 -07:00
dnet.h
dummy.c
e100.c	e100/e1000*/igb*/ixgb*: Add missing read memory barrier	2010-08-08 20:02:45 -07:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c
epic100.c
eql.c	drivers/net/eql.c: prevent reading uninitialized stack memory	2010-09-16 21:54:59 -07:00
es3210.c
eth16i.c
ethoc.c	ethoc: add devinit/devexit section initializers	2010-07-26 18:45:05 -07:00
ewrk3.c
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
fec_mpc52xx.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
fec_mpc52xx.h
fec.c
fec.h
forcedeth.c
fsl_pq_mdio.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
fsl_pq_mdio.h
gianfar_ethtool.c
gianfar_sysfs.c
gianfar.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
gianfar.h	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
greth.c	of/sparc: fix build regression from of_device changes	2010-08-08 01:20:06 -06:00
greth.h	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
hamachi.c
hp100.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	ibmveth: Fix opps during MTU change on an active device	2010-08-19 00:09:48 -07:00
ibmveth.h
ifb.c
ioc3-eth.c
ipg.c
ipg.h
iseries_veth.c
jazzsonic.c
jme.c
jme.h
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-08-23 18:30:30 -07:00
korina.c
ks8842.c	ks8842: Fix warnings on 64-bit.	2010-07-27 22:24:37 -07:00
ks8851_mll.c
ks8851.c	KS8851: Correct RX packet allocation	2010-09-08 21:47:13 -07:00
ks8851.h
ksz884x.c	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-08-04 15:31:02 -07:00
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
ll_temac_main.c	of: Fix missing includes - ll_temac	2010-09-01 08:55:23 -06:00
ll_temac_mdio.c	of: Fix missing includes - ll_temac	2010-09-01 08:55:23 -06:00
ll_temac.h
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c	macvlan: Fix rx counters update in macvlan_handle_frame()	2010-07-27 21:02:42 -07:00
macvtap.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-27 21:01:35 -07:00
Makefile	net: add Fast Ethernet driver for PXA168.	2010-08-18 23:30:42 -07:00
mdio.c
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c
mvme147.c
myri_sbus.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
myri_sbus.h	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-09-08 23:49:04 -07:00
niu.h
ns83820.c
pasemi_mac_ethtool.c
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c
plip.c
ppp_async.c	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
ppp_deflate.c
ppp_generic.c	ppp: potential NULL dereference in ppp_mp_explode()	2010-09-13 12:44:11 -07:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
pppoe.c	ppp: make channel_ops const	2010-08-04 21:53:17 -07:00
pppox.c
ps3_gelic_net.c
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
pxa168_eth.c	pxa168_eth: fix a mdiobus leak	2010-09-01 14:29:34 -07:00
qla3xxx.c	drivers/net/qla3xxx.c: Checkpatch cleanups	2010-07-26 13:15:21 -07:00
qla3xxx.h
r6040.c
r8169.c	r8169: Handle rxfifo errors on 8168 chips	2010-09-15 19:32:59 -07:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c
s2io.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-07-27 21:01:35 -07:00
s6gmac.c
sb1000.c
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	net: sh_eth: remove unused variable	2010-08-19 00:39:45 -07:00
sh_eth.h
sis190.c
sis900.c
sis900.h
skge.c
skge.h
sky2.c	Revert "sky2: don't do GRO on second port"	2010-09-02 09:39:09 -07:00
sky2.h
slhc.c
slip.c
slip.h
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
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sunbmac.h	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sunhme.h	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sunlance.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sunqe.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sunqe.h	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
sunvnet.c
sunvnet.h
tc35815.c
tehuti.c
tehuti.h
tg3.c	tg3: Update version to 3.113	2010-08-02 15:46:33 -07:00
tg3.h	tg3: Migrate tg3_flags to phy_flags	2010-08-02 15:46:33 -07:00
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	tun: keep link (carrier) state up to date	2010-07-30 22:06:41 -07:00
typhoon.c
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
ucc_geth.h
veth.c
via-rhine.c
via-velocity.c	via-velocity: Turn scatter-gather support back off.	2010-09-07 13:57:24 -07:00
via-velocity.h
virtio_net.c	virtio_net: implements ethtool_ops.get_drvinfo	2010-08-04 21:53:17 -07:00
wd.c
xen-netfront.c
xilinx_emaclite.c	of/device: Replace struct of_device with struct platform_device	2010-08-06 09:25:50 -06:00
xtsonic.c
yellowfin.c
znet.c
zorro8390.c