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	bugfixes and new hardware support for arcnet driver	2007-02-17 15:30:48 -05:00
arm	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
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	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
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	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
fs_enet	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
hamradio	Replace local random function with random32()	2007-02-20 11:18:13 -05:00
ibm_emac	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
irda	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
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	PCMCIA-NETDEV : the 2nd argument of el3_interrrupt and smc_interrupt is struct net_device*	2007-02-17 15:16:08 -05:00
phy	phylib: Add support for Marvell 88e1111S and 88e1145	2007-02-17 15:16:08 -05:00
sk98lin	sk98lin: planned removal	2007-02-17 15:37:14 -05:00
skfp	net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff	2007-02-27 04:30:42 -05:00
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	Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes	2007-03-02 19:40:24 -05:00
3c59x.c	3c59x: Handle pci_enable_device() failure while resuming	2007-03-06 06:10:02 -05:00
3c501.c
3c501.h
3c503.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c
3c527.h
7990.c	[PATCH] Scheduled removal of SA_xxx interrupt flags fixups	2007-02-14 08:09:54 -08:00
7990.h
8139cp.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
8139too.c	8139too: RTNL and flush_scheduled_work deadlock	2007-02-20 11:18:12 -05:00
8390.c
8390.h
82596.c
a2065.c
a2065.h
ac3200.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
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	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
au1000_eth.h
b44.c	B44: increase wait loop	2007-02-17 15:37:14 -05:00
b44.h	b44 endian annotations	2007-02-06 19:03:56 -05:00
bmac.c	net: use bitrev8	2007-02-05 16:58:47 -05:00
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	net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff	2007-02-27 04:30:42 -05:00
de600.h
de620.c
de620.h
declance.c	mips: declance: Driver model for the PMAD-A	2007-02-07 18:49:11 -05:00
defxx.c	[TC] defxx: TURBOchannel support	2007-02-09 16:23:17 +00:00
defxx.h	[TC] defxx: TURBOchannel support	2007-02-09 16:23:17 +00:00
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	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
eepro100.c
eepro.c
eexpress.c	drivers/net/eexpress.c: remove duplicate comment	2007-02-17 19:56:23 +01:00
eexpress.h
epic100.c
eql.c
es3210.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
eth16i.c
ewrk3.c
ewrk3.h
fealnx.c
fec.c
fec.h
forcedeth.c	forcedeth: fix checksum feature in mcp65	2007-02-27 04:16:02 -05:00
gianfar_ethtool.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
gianfar_mii.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
gianfar_mii.h
gianfar_sysfs.c	Merge branch 'master' into upstream	2007-02-17 15:11:43 -05:00
gianfar.c	[GIANFAR]: Fix compile error in latest git	2007-03-05 13:29:55 -08:00
gianfar.h
hamachi.c
hp100.c	hp100: convert pci_module_init() to pci_register_driver()	2007-02-06 19:10:33 -05:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	[PATCH] mark struct file_operations const 5	2007-02-12 09:48:45 -08:00
ibmveth.h
ifb.c
ioc3-eth.c	Fix link autonegotiation timer.	2007-02-17 15:37:14 -05:00
isa-skeleton.c
iseries_veth.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
jazzsonic.c
Kconfig	spidernet: spidernet: add support for Celleb	2007-02-27 04:16:03 -05:00
lance.c
lasi_82596.c
lib8390.c
LICENSE.SRC
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	macb: Remove inappropriate spinlocks around mii calls	2007-02-17 15:30:48 -05:00
macb.h	AT91: MACB support	2007-02-07 18:50:53 -05:00
mace.c	net: use bitrev8	2007-02-05 16:58:47 -05:00
mace.h
macmace.c	net: use bitrev8	2007-02-05 16:58:47 -05:00
macsonic.c	[PATCH] missing include in macsonic	2007-02-09 08:28:48 -08:00
Makefile	Add Attansic L1 ethernet driver.	2007-02-08 10:42:37 -05:00
meth.c	Convert meth to netdev_priv	2007-02-17 15:30:47 -05:00
meth.h
mii.c
mipsnet.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
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	net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff	2007-02-27 04:30:42 -05:00
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	PA Semi PWRficient Ethernet driver	2007-02-05 16:58:52 -05:00
pasemi_mac.h	PA Semi PWRficient Ethernet driver	2007-02-05 16:58:52 -05:00
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	[PATCH] mark struct file_operations const 5	2007-02-12 09:48:45 -08:00
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	qla3xxx: Kernic Panic on pSeries under stress conditions	2007-02-27 04:21:45 -05:00
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: Added a loadable parameter to enable or disable vlan stripping in frame.	2007-02-27 04:27:11 -05:00
s2io.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
s2io.h	S2IO: Added a loadable parameter to enable or disable vlan stripping in frame.	2007-02-27 04:27:11 -05:00
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c
sc92031.c	[PATCH] Scheduled removal of SA_xxx interrupt flags fixups 2	2007-02-14 08:09:55 -08:00
seeq8005.c
seeq8005.h
sgiseeq.c	sgiseeq: Don't include unnecessary headerfiles.	2007-02-27 04:21:25 -05:00
sgiseeq.h
shaper.c
sis190.c	sis190: RTNL and flush_scheduled_work deadlock	2007-02-20 11:18:12 -05:00
sis900.c	sis900 warning fixes	2007-03-06 06:14:54 -05:00
sis900.h
skge.c	skge: comma consistency	2007-02-27 04:16:04 -05:00
skge.h	skge: fix transmitter flow control	2007-02-27 04:16:04 -05:00
sky2.c	[VLAN]: Avoid a 4-order allocation.	2007-03-02 20:44:51 -08:00
sky2.h	sky2: transmit timeout	2007-02-17 15:30:47 -05:00
slhc.c
slip.c	[NET] slip: Replace kmalloc() + memset() pairs with the appropriate kzalloc() calls	2007-02-08 12:38:55 -08:00
slip.h
smc91x.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
smc91x.h
smc911x.c	Network: convert network devices to use struct device instead of class_device	2007-02-07 10:37:11 -08:00
smc911x.h
smc9194.c
smc9194.h
smc-mca.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
smc-ultra32.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
smc-ultra.c	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
sonic.c
sonic.h
Space.c	remove the broken SKMC driver	2007-02-05 16:58:46 -05:00
spider_net_ethtool.c
spider_net.c	spidernet: janitorial, typos	2007-02-27 04:16:03 -05:00
spider_net.h	spidernet: janitorial, typos	2007-02-27 04:16:03 -05:00
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	net: remove a collection of unneeded #undef REALLY_SLOW_IO stuff	2007-02-27 04:30:42 -05:00
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c	sungem_phy: support bcm5461 phy, autoneg.	2007-02-27 04:16:02 -05:00
sungem_phy.h	sungem_phy: support bcm5461 phy, autoneg.	2007-02-27 04:16:02 -05:00
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	[TG3]: TSO workaround fixes.	2007-02-26 11:42:47 -08:00
tlan.c
tlan.h
tsi108_eth.c	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
tsi108_eth.h
tun.c	[PATCH] mark struct file_operations const 5	2007-02-12 09:48:45 -08:00
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	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
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	[PATCH] kill eth_io_copy_and_sum()	2007-02-09 09:14:07 -08:00
yellowfin.c
znet.c
zorro8390.c