You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 152a6a9da1 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts [IPV4] SNMP: Support InMcastPkts and InBcastPkts [IPV4] SNMP: Support InTruncatedPkts [IPV4] SNMP: Support InNoRoutes [SNMP]: Add definitions for {In,Out}BcastPkts [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent [TCP] FRTO: Delay skb available check until it's mandatory [XFRM]: Restrict upper layer information by bundle. [TCP]: Catch skb with S+L bugs earlier [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo [L2TP]: Add the ability to autoload a pppox protocol module. [SKB]: Introduce skb_queue_walk_safe() [AF_IUCV/IUCV]: smp_call_function deadlock [IPV6]: Fix slab corruption running ip6sic [TCP]: Update references in two old comments [XFRM]: Export SPD info [IPV6]: Track device renames in snmp6. [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage. [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats. [NETPOLL]: Remove CONFIG_NETPOLL_RX ...		18 years ago
..
appletalk	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	18 years ago
arcnet	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	18 years ago
arm	…
atl1	[NETDRV]: Perform missing csum_offset conversions	18 years ago
bonding	[NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.	18 years ago
chelsio	…
cris	…
cxgb3	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	18 years ago
e1000	e1000: ROUND_UP macro cleanup in drivers/net/e1000	18 years ago
ehea	ehea: fix for dlpar support	18 years ago
fec_8xx	…
fs_enet	…
hamradio	baycom_ser_fdx: also allow i/o ports >= 0x1000 and enhanced failure logging	18 years ago
ibm_emac	…
irda	[IrDA]: Adding carriage returns to mcs7780 debug statements	18 years ago
ixgb	…
ixp2000	…
myri10ge	…
netxen	NetXen: Fix for vmalloc issues	18 years ago
pcmcia	…
phy	…
sk98lin	sk98lin: handle pci_enable_device() return value in skge_resume()	18 years ago
skfp	…
tokenring	…
tulip	Rev tulip version	18 years ago
wan	…
wireless	[PATCH] zd1211rw: Add ID for ZyXEL AG-220	18 years ago
3c59x.c	…
3c501.c	…
3c501.h	…
3c503.c	[PATCH] kill eth_io_copy_and_sum()	18 years ago
3c503.h	…
3c505.c	…
3c505.h	drivers/net: Trim trailing whitespace	19 years ago
3c507.c	…
3c509.c	…
3c515.c	[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans	18 years ago
3c523.c	…
3c523.h	…
3c527.c	…
3c527.h	…
7990.c	…
7990.h	…
8139cp.c	…
8139too.c	[SK_BUFF]: Introduce skb_copy_to_linear_data{_offset}	18 years ago
8390.c	…
8390.h	…
82596.c	…
Kconfig	Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	18 years ago
LICENSE.SRC	…
Makefile	…
Space.c	…
a2065.c	…
a2065.h	…
ac3200.c	…
acenic.c	…
acenic.h	…
acenic_firmware.h	…
amd8111e.c	…
amd8111e.h	…
apne.c	…
ariadne.c	[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans	18 years ago
ariadne.h	…
at1700.c	…
atari_bionet.c	…
atari_pamsnet.c	…
atarilance.c	…
atp.c	…
atp.h	…
au1000_eth.c	…
au1000_eth.h	drivers/net: Trim trailing whitespace	19 years ago
b44.c	…
b44.h	…
bmac.c	…
bmac.h	…
bnx2.c	…
bnx2.h	…
bnx2_fw.h	…
bnx2_fw2.h	…
bsd_comp.c	…
cassini.c	…
cassini.h	…
cs89x0.c	…
cs89x0.h	…
de600.c	[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans	18 years ago
de600.h	…
de620.c	…
de620.h	…
declance.c	…
defxx.c	…
defxx.h	…
depca.c	…
depca.h	…
dgrs.c	…
dgrs.h	…
dgrs_asstruct.h	…
dgrs_bcomm.h	…
dgrs_es4h.h	…
dgrs_ether.h	…
dgrs_firmware.c	…
dgrs_i82596.h	drivers/net: Trim trailing whitespace	19 years ago
dgrs_plx9060.h	…
dl2k.c	…
dl2k.h	…
dm9000.c	…
dm9000.h	…
dummy.c	…
e100.c	…
e2100.c	…
eepro.c	…
eepro100.c	…
eexpress.c	…
eexpress.h	drivers/net: Trim trailing whitespace	19 years ago
epic100.c	…
eql.c	…
es3210.c	…
eth16i.c	…
ewrk3.c	…
ewrk3.h	drivers/net: Trim trailing whitespace	19 years ago
fealnx.c	…
fec.c	…
fec.h	…
forcedeth.c	…
gianfar.c	…
gianfar.h	…
gianfar_ethtool.c	[PATCH] remove many unneeded #includes of sched.h	18 years ago
gianfar_mii.c	…
gianfar_mii.h	…
gianfar_sysfs.c	…
hamachi.c	…
hp-plus.c	…
hp.c	…
hp100.c	…
hp100.h	…
hplance.c	…
hplance.h	…
hydra.c	…
ibmlana.c	…
ibmlana.h	…
ibmveth.c	…
ibmveth.h	…
ifb.c	…
ioc3-eth.c	…
isa-skeleton.c	…
iseries_veth.c	…
jazzsonic.c	…
lance.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	18 years ago
lasi_82596.c	…
lib8390.c	…
lne390.c	…
loopback.c	…
lp486e.c	…
mac89x0.c	…
mac8390.c	…
macb.c	…
macb.h	…
mace.c	…
mace.h	…
macmace.c	[SK_BUFF]: Introduce skb_copy_from_linear_data{_offset}	18 years ago
macsonic.c	…
meth.c	…
meth.h	…
mii.c	mii: add kernel-doc notation	18 years ago
mipsnet.c	…
mipsnet.h	[PATCH] mipsnet: Fix Copyright notice.	19 years ago
mv643xx_eth.c	…
mv643xx_eth.h	…
mvme147.c	…
myri_code.h	…
myri_sbus.c	…
myri_sbus.h	…
natsemi.c	…
ne-h8300.c	[PATCH] 8390 fixes - the final chunk (h8300)	18 years ago
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	…
ns83820.c	…
pasemi_mac.c	Revert "[POWERPC] Rename get_property to of_get_property: drivers"	18 years ago
pasemi_mac.h	…
pci-skeleton.c	…
pcnet32.c	…
plip.c	…
ppp_async.c	…
ppp_deflate.c	…
ppp_generic.c	[NET]: ROUND_UP macro cleanup in drivers/net/ppp_generic.c	18 years ago
ppp_mppe.c	…
ppp_mppe.h	…
ppp_synctty.c	…
pppoe.c	[PPPOE]: Fix device tear-down notification.	18 years ago
pppox.c	…
qla3xxx.c	…
qla3xxx.h	…
r8169.c	…
rionet.c	…
rrunner.c	…
rrunner.h	…
s2io-regs.h	…
s2io.c	…
s2io.h	…
saa9730.c	…
saa9730.h	…
sb1000.c	…
sb1250-mac.c	…
sc92031.c	[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans	18 years ago
seeq8005.c	[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans	18 years ago
seeq8005.h	…
sgiseeq.c	…
sgiseeq.h	…
shaper.c	…
sis190.c	…
sis900.c	…
sis900.h	…
skge.c	…
skge.h	…
sky2.c	…
sky2.h	…
slhc.c	…
slip.c	…
slip.h	…
smc-mca.c	…
smc-ultra.c	…
smc-ultra32.c	…
smc91x.c	…
smc91x.h	…
smc911x.c	smc911x: fix compilation breakage wjen debug is on	18 years ago
smc911x.h	…
smc9194.c	…
smc9194.h	drivers/net: Trim trailing whitespace	19 years ago
sonic.c	…
sonic.h	…
spider_net.c	…
spider_net.h	…
spider_net_ethtool.c	…
starfire.c	…
starfire_firmware.h	…
starfire_firmware.pl	…
stnic.c	…
sun3_82586.c	…
sun3_82586.h	…
sun3lance.c	…
sunbmac.c	…
sunbmac.h	…
sundance.c	…
sungem.c	…
sungem.h	…
sungem_phy.c	Revert "[POWERPC] Rename get_property to of_get_property: drivers"	18 years ago
sungem_phy.h	…
sunhme.c	…
sunhme.h	…
sunlance.c	…
sunqe.c	…
sunqe.h	…
tc35815.c	…
tg3.c	…
tg3.h	…
tlan.c	…
tlan.h	…
tsi108_eth.c	…
tsi108_eth.h	[PATCH] Add tsi108/9 On Chip Ethernet device driver support	18 years ago
tun.c	…
typhoon-firmware.h	…
typhoon.c	…
typhoon.h	…
ucc_geth.c	ucc_geth: version 1.1	18 years ago
ucc_geth.h	…
ucc_geth_mii.c	…
ucc_geth_mii.h	…
via-rhine.c	…
via-velocity.c	…
via-velocity.h	…
wd.c	…
yellowfin.c	…
znet.c	…
zorro8390.c	…