Linus Torvalds 59be2e04e5 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: (26 commits) net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2 ixgbe: allow tx of pre-formatted vlan tagged packets ixgbe: Fix 82598 premature copper PHY link indicatation ixgbe: Fix tx_restart_queue/non_eop_desc statistics counters bcm63xx_enet: fix compilation failure after get_stats_count removal packet: dont call sleeping functions while holding rcu_read_lock() tcp: Revert per-route SACK/DSACK/TIMESTAMP changes. ipvs: zero usvc and udest netfilter: fix crashes in bridge netfilter caused by fragment jumps ipv6: reassembly: use seperate reassembly queues for conntrack and local delivery sky2: leave PCI config space writeable sky2: print Optima chip name x25: Update maintainer. ipvs: fix synchronization on connection close netfilter: xtables: document minimal required version drivers/net/bonding/: : use pr_fmt can: CAN_MCP251X should depend on HAS_DMA drivers/net/usb: Correct code taking the size of a pointer drivers/net/cpmac.c: Correct code taking the size of a pointer drivers/net/sfc: Correct code taking the size of a pointer ...		2009-12-16 10:33:18 -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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
arm	Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6	2009-12-12 15:22:22 -08:00
atl1c	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-11 17:12:17 -08:00
atl1e	atl1e: Remove non-implementation of ethtool set_msglevel() operation	2009-12-02 22:10:16 -08:00
atlx	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
benet	be2net: fix error in rx completion processing.	2009-12-11 22:59:09 -08:00
bonding	drivers/net/bonding/: : use pr_fmt	2009-12-13 20:06:07 -08:00
can	can: CAN_MCP251X should depend on HAS_DMA	2009-12-13 19:56:36 -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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
e1000e	e1000e: only perform ESB2 MDIC workaround on certain configurations	2009-12-08 20:10:12 -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	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-12-09 19:43:33 -08:00
ibm_newemac	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
igb	igb: fix handling of mailbox collisions between PF/VF	2009-12-11 22:57:34 -08:00
igbvf	igbvf: avoid reset storms due to mailbox issues	2009-12-11 22:58:14 -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	ixgb: remove use of skb_dma_map from ixgb	2009-12-02 19:57:11 -08:00
ixgbe	ixgbe: allow tx of pre-formatted vlan tagged packets	2009-12-15 23:18:26 -08:00
ixp2000	…
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-16 10:33:18 -08:00
myri10ge	myri10ge: use src+dst for rss hashing	2009-12-08 20:24:35 -08:00
netxen	netxen: fix firmware type check	2009-12-08 20:37:46 -08:00
pcmcia	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-16 10:33:18 -08:00
phy	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
qlge	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
sfc	drivers/net/sfc: Correct code taking the size of a pointer	2009-12-13 19:56:34 -08:00
skfp	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
usb	drivers/net/usb: Correct code taking the size of a pointer	2009-12-13 19:56:35 -08:00
vmxnet3	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
vxge	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -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 branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-12-11 17:12:17 -08:00
3c59x.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
3c501.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
3c501.h	…
3c503.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
3c503.h	…
3c505.c	…
3c505.h	…
3c507.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
3c509.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
3c515.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
3c523.c	…
3c523.h	…
3c527.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
3c527.h	…
7990.c	…
7990.h	…
8139cp.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
8139too.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
8390.c	…
8390.h	…
8390p.c	…
82596.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
Kconfig	net: niu uses crc32, so select CRC32	2009-12-10 13:50:56 -08:00
LICENSE.SRC	…
Makefile	…
Space.c	…
a2065.c	…
a2065.h	…
ac3200.c	…
acenic.c	…
acenic.h	…
amd8111e.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
amd8111e.h	…
apne.c	…
ariadne.c	…
ariadne.h	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
at1700.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
atarilance.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
atp.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
bfin_mac.h	…
bmac.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
bmac.h	…
bnx2.c	bnx2: Refine VPD logic.	2009-12-03 15:58:00 -08:00
bnx2.h	bnx2: Dump some state during tx timeout.	2009-12-03 13:18:11 -08:00
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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
bnx2x_link.h	…
bnx2x_main.c	…
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.h	…
davinci_emac.c	…
de600.c	…
de600.h	…
de620.c	…
de620.h	…
declance.c	…
defxx.c	…
defxx.h	…
depca.c	…
depca.h	…
dl2k.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
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	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-01 22:13:38 -08:00
e2100.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
eepro.c	…
eexpress.c	…
eexpress.h	…
enc28j60.c	…
enc28j60_hw.h	…
epic100.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
eql.c	…
es3210.c	…
eth16i.c	…
ethoc.c	…
ewrk3.c	…
ewrk3.h	…
fealnx.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
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.h	…
gianfar.c	gianfar: Fix build with CONFIG_NET_POLL_CONTROLLER=y	2009-12-09 02:52:19 -08:00
gianfar.h	…
gianfar_ethtool.c	…
gianfar_sysfs.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
hamachi.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
hp-plus.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
hp.c	…
hp100.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
hp100.h	…
hplance.c	…
hplance.h	…
hydra.c	…
ibmlana.c	…
ibmlana.h	…
ibmveth.c	…
ibmveth.h	…
ifb.c	…
ioc3-eth.c	…
ipg.c	…
ipg.h	…
isa-skeleton.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
jme.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
jme.h	…
korina.c	…
ks8842.c	…
ks8851.c	net: Fix ks8851 snl NULL pointer dereference Oops	2009-12-03 16:04:25 -08:00
ks8851.h	…
ks8851_mll.c	…
lance.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
lasi_82596.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
lib8390.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
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: Move && and || to end of previous line	2009-12-03 13:18:01 -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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
mac8390.c	…
macb.c	…
macb.h	…
mace.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
mace.h	…
macmace.c	…
macsonic.c	…
macvlan.c	netdevice: provide common routine for macvlan and vlan operstate management	2009-12-03 15:59:22 -08:00
mdio.c	…
meth.c	…
meth.h	…
mii.c	…
mipsnet.c	…
mv643xx_eth.c	mv643xx_eth: check for valid hw address (resubmit)	2009-12-08 20:36:00 -08:00
mvme147.c	…
myri_sbus.c	…
myri_sbus.h	…
natsemi.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
ne-h8300.c	…
ne.c	…
ne2.c	…
ne2k-pci.c	…
ne3210.c	…
netconsole.c	…
netx-eth.c	…
ni52.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
ni52.h	…
ni65.c	…
ni65.h	…
ni5010.c	…
ni5010.h	…
niu.c	…
niu.h	…
ns83820.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
pasemi_mac.c	…
pasemi_mac.h	…
pasemi_mac_ethtool.c	…
pci-skeleton.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
pcnet32.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
plip.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
ppp_async.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
ppp_deflate.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
ppp_generic.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
ppp_mppe.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
ppp_mppe.h	…
ppp_synctty.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
pppoe.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
pppol2tp.c	net: Simplify pppol2tp pernet operations.	2009-12-01 16:15:57 -08:00
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	net/ps3: Add support for gelic link negotiation	2009-12-02 00:52:31 -08:00
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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
r8169.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
rionet.c	…
rrunner.c	…
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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
sb1000.c	…
sb1250-mac.c	…
sc92031.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
seeq8005.c	…
seeq8005.h	…
sgiseeq.c	…
sgiseeq.h	…
sh_eth.c	net: sh_eth alignment fix for sh7724 using NET_IP_ALIGN V2	2009-12-15 23:18:27 -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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
skge.h	…
sky2.c	sky2: leave PCI config space writeable	2009-12-14 22:07:15 -08:00
sky2.h	…
slhc.c	…
slip.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
slip.h	…
smc-mca.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
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	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
smsc9420.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-12-01 22:13:38 -08:00
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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
stnic.c	…
sun3_82586.c	…
sun3_82586.h	…
sun3lance.c	…
sunbmac.c	…
sunbmac.h	…
sundance.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
sungem.c	…
sungem.h	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
sungem_phy.c	…
sungem_phy.h	…
sunhme.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
sunhme.h	…
sunlance.c	…
sunqe.c	…
sunqe.h	…
sunvnet.c	…
sunvnet.h	…
tc35815.c	…
tehuti.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
tehuti.h	…
tg3.c	tg3: Update version to 3.105	2009-12-03 13:18:08 -08:00
tg3.h	tg3: Add some VPD preprocessor constants	2009-12-03 13:18:04 -08:00
tlan.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
tlan.h	…
tsi108_eth.c	…
tsi108_eth.h	…
tun.c	…
typhoon.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
typhoon.h	…
ucc_geth.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
ucc_geth.h	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01: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	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
via-velocity.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
via-velocity.h	…
virtio_net.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
wd.c	…
xen-netfront.c	…
xilinx_emaclite.c	…
xtsonic.c	…
yellowfin.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
znet.c	drivers/net: Move && and || to end of previous line	2009-12-03 13:18:01 -08:00
zorro8390.c	…