Linus Torvalds 5b3c1184e7 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: [DCCP]: Set RTO for newly created child socket [DCCP]: Correctly split CCID half connections [NET]: Fix compat_sock_common_getsockopt typo. [NET]: Revert incorrect accept queue backlog changes. [INET]: twcal_jiffie should be unsigned long, not int [GIANFAR]: Fix compile error in latest git [PPPOE]: Use ifindex instead of device pointer in key lookups. [NETFILTER]: ip6_route_me_harder should take into account mark [NETFILTER]: nfnetlink_log: fix reference counting [NETFILTER]: nfnetlink_log: fix module reference counting [NETFILTER]: nfnetlink_log: fix possible NULL pointer dereference [NETFILTER]: nfnetlink_log: fix NULL pointer dereference [NETFILTER]: nfnetlink_log: fix use after free [NETFILTER]: nfnetlink_log: fix reference leak [NETFILTER]: tcp conntrack: accept SYN|URG as valid [NETFILTER]: nf_conntrack/nf_nat: fix incorrect config ifdefs [NETFILTER]: conntrack: fix {nf,ip}_ct_iterate_cleanup endless loops		2007-03-06 19:53:34 -08:00
..
appletalk
arcnet
arm
atl1	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
bonding	bonding: Improve IGMP join processing	2007-03-06 06:08:11 -05:00
chelsio	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
cris
cxgb3	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
e1000	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
ehea	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
fec_8xx
fs_enet
hamradio
ibm_emac
irda
ixgb	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
ixp2000
myri10ge	myri10ge: fix copyright and license	2007-03-02 19:55:07 -05:00
netxen	NetXen: Fix second rmmod failure observed on PowerPC machines.	2007-03-02 20:02:28 -05:00
pcmcia
phy
sk98lin
skfp
tokenring
tulip	__devinit & __devexit cleanups for de2104x driver	2007-03-06 06:10:02 -05:00
wan	[HDLC] Fix dev->header_cache_update having a random value.	2007-03-02 20:37:37 -08:00
wireless
3c59x.c	3c59x: Handle pci_enable_device() failure while resuming	2007-03-06 06:10:02 -05: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	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
8139too.c
8390.c
8390.h
82596.c
a2065.c
a2065.h
ac3200.c
acenic_firmware.h
acenic.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
acenic.h
amd8111e.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atari_bionet.c
atari_pamsnet.c
atarilance.c
atp.c
atp.h
au1000_eth.c
au1000_eth.h
b44.c
b44.h
bmac.c
bmac.h
bnx2_fw2.h
bnx2_fw.h
bnx2.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
bnx2.h
bsd_comp.c
cassini.c
cassini.h
cs89x0.c
cs89x0.h
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c
depca.h
dgrs_asstruct.h
dgrs_bcomm.h
dgrs_es4h.h
dgrs_ether.h
dgrs_firmware.c
dgrs_i82596.h
dgrs_plx9060.h
dgrs.c
dgrs.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h
dummy.c
e100.c
e2100.c
eepro100.c
eepro.c
eexpress.c
eexpress.h
epic100.c
eql.c
es3210.c
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c
fec.c
fec.h
forcedeth.c
gianfar_ethtool.c
gianfar_mii.c
gianfar_mii.h
gianfar_sysfs.c
gianfar.c	[GIANFAR]: Fix compile error in latest git	2007-03-05 13:29:55 -08:00
gianfar.h
hamachi.c
hp100.c
hp100.h
hp-plus.c
hp.c
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
Kconfig
lance.c
lasi_82596.c
lib8390.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c
macb.h
mace.c
mace.h
macmace.c
macsonic.c
Makefile
meth.c
meth.h
mii.c
mipsnet.c
mipsnet.h
mv643xx_eth.c	mv643xx_eth: Place explicit port number in mv643xx_eth_platform_data	2007-03-06 06:14:54 -05:00
mv643xx_eth.h	Fix mv643xx_eth compilation.	2007-03-02 20:16:10 -05:00
mvme147.c
myri_code.h
myri_sbus.c
myri_sbus.h
natsemi.c	natsemi: netpoll fixes	2007-03-06 06:10:01 -05:00
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
ns83820.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c	pcnet32: Fix PCnet32 performance bug on non-coherent architecutres	2007-03-06 06:14:54 -05:00
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c	[PPPOE]: Use ifindex instead of device pointer in key lookups.	2007-03-05 13:25:28 -08:00
pppox.c
qla3xxx.c	qla3xxx: bugfix for line omitted in previous patch.	2007-03-02 20:16:10 -05:00
qla3xxx.h
r8169.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
s2io.h
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
shaper.c
sis190.c
sis900.c	sis900 warning fixes	2007-03-06 06:14:54 -05:00
sis900.h
skge.c
skge.h
sky2.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08: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
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire_firmware.h
starfire_firmware.pl
starfire.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c
sungem.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
tc35815.c	jmr3927: do not call tc35815_killall().	2007-03-02 19:55:07 -05:00
tg3.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
tg3.h
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c
typhoon-firmware.h
typhoon.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
typhoon.h
ucc_geth_phy.c
ucc_geth_phy.h
ucc_geth.c	ucc_geth: returns NETDEV_TX_BUSY when BD ring is full	2007-03-06 06:10:02 -05:00
ucc_geth.h
via-rhine.c
via-velocity.c
via-velocity.h
wd.c
yellowfin.c
znet.c
zorro8390.c