Linus Torvalds 74e651f0aa 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: (30 commits) [TIPC]: Initial activation message now includes TIPC version number [TIPC]: Improve response to requests for node/link information [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf [IrDA]: Fix the AU1000 FIR dependencies [IrDA]: Fix RCU lock pairing on error path [XFRM]: unexport xfrm_state_mtu [NET]: make skb_release_data() static [NETFILTE] ipv4: Fix typo (Bugzilla #6753) [IrDA]: MCS7780 usb_driver struct should be static [BNX2]: Turn off link during shutdown [BNX2]: Use dev_kfree_skb() instead of the _irq version [ATM]: basic sysfs support for ATM devices [ATM]: [suni] change suni_init to __devinit [ATM]: [iphase] should be __devinit not __init [ATM]: [idt77105] should be __devinit not __init [BNX2]: Add NETIF_F_TSO_ECN [NET]: Add ECN support for TSO [AF_UNIX]: Datagram getpeersec [NET]: Fix logical error in skb_gso_ok [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000 ...		2006-06-29 17:43:43 -07:00
..
appletalk
arcnet
arm	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
bonding
chelsio	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
cris
e1000	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
fec_8xx
fs_enet	[PATCH] Remove redundant NULL checks before [kv]free - in drivers/	2006-06-27 17:32:48 -07:00
hamradio	[PATCH] drivers/net/hamradio/dmascc.c: fix section mismatch	2006-06-26 22:03:24 -04:00
ibm_emac
irda	[IrDA]: Fix the AU1000 FIR dependencies	2006-06-29 17:03:19 -07:00
ixgb	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
ixp2000
myri10ge	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
pcmcia	spelling fixes	2006-06-26 18:35:02 +02:00
phy	[PATCH] Fix phy id for LXT971A/LXT972A	2006-06-26 22:03:07 -04:00
sk98lin	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
skfp
tokenring	[PATCH] Dereference in tokenring/olympic.c	2006-06-22 23:24:18 -04:00
tulip	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2006-06-29 10:49:17 -07:00
wan	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6	2006-06-29 14:19:21 -07:00
wireless	[PATCH] Remove redundant NULL checks before [kv]free - in drivers/	2006-06-27 17:32:48 -07:00
3c59x.c	Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6	2006-06-29 10:49:17 -07:00
3c501.c	spelling fixes	2006-06-26 18:35:02 +02:00
3c501.h
3c503.c
3c503.h
3c505.c
3c505.h
3c507.c
3c509.c
3c515.c
3c523.c
3c523.h
3c527.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
3c527.h
7990.c
7990.h
8139cp.c	[PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed	2006-06-27 09:24:00 -07:00
8139too.c	[PATCH] 64bit resource: fix up printks for resources in networks drivers	2006-06-27 09:23:58 -07:00
8390.c	[PATCH] skb_padto()-area fixes in 8390, wavelan	2006-06-22 23:32:02 -04:00
8390.h
82596.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
a2065.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
a2065.h
ac3200.c
acenic.c
acenic.h
acenic_firmware.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
ariadne.h
at1700.c
atari_bionet.c
atari_pamsnet.c
atarilance.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
atp.c
atp.h
au1000_eth.c
au1000_eth.h
b44.c	[PATCH] b44: update version to 1.01	2006-06-22 23:16:13 -04:00
b44.h	[PATCH] b44: add wol for old nic	2006-06-22 23:16:13 -04:00
bmac.c
bmac.h
bnx2.c	[BNX2]: Turn off link during shutdown	2006-06-29 16:58:24 -07:00
bnx2.h	[BNX2]: Turn off link during shutdown	2006-06-29 16:58:24 -07:00
bnx2_fw.h
bsd_comp.c
cassini.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
cassini.h
cs89x0.c
cs89x0.h
de600.c
de600.h
de620.c
de620.h
declance.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
defxx.c
defxx.h
depca.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
depca.h
dgrs.c
dgrs.h
dgrs_asstruct.h
dgrs_bcomm.h
dgrs_es4h.h
dgrs_ether.h
dgrs_firmware.c
dgrs_i82596.h
dgrs_plx9060.h
dl2k.c
dl2k.h	[netdrvr] Remove long-unused bits from Becker template drivers	2006-06-26 23:47:50 -04:00
dm9000.c	[PATCH] DM9000 - minor code cleanups	2006-06-26 22:01:53 -04:00
dm9000.h
dummy.c
e100.c	[PATCH] 64bit resource: fix up printks for resources in networks drivers	2006-06-27 09:23:58 -07:00
e2100.c
eepro.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
eepro100.c	[netdrvr] Remove long-unused bits from Becker template drivers	2006-06-26 23:47:50 -04:00
eexpress.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
eexpress.h
epic100.c	[netdrvr] Remove long-unused bits from Becker template drivers	2006-06-26 23:47:50 -04:00
eql.c
es3210.c
eth16i.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
ewrk3.c
ewrk3.h
fealnx.c	[netdrvr] Remove long-unused bits from Becker template drivers	2006-06-26 23:47:50 -04:00
fec.c	[PATCH] m68knommu: FEC driver event/irq fixes	2006-06-27 18:30:14 -07:00
fec.h	[PATCH] m68knommu: 532x FEC eth struct map	2006-06-25 17:43:33 -07:00
forcedeth.c	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
gianfar.c
gianfar.h
gianfar_ethtool.c
gianfar_mii.c
gianfar_mii.h
gianfar_sysfs.c
gt64240eth.h
gt96100eth.c
gt96100eth.h
hamachi.c
hp-plus.c
hp.c
hp100.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
hp100.h
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
ibmveth.h
ifb.c
ioc3-eth.c	[PATCH] IP27: Really set PCI64_ATTR_VIRTUAL, not PCI64_ATTR_PREC.	2006-06-22 22:52:35 -04:00
isa-skeleton.c
iseries_veth.c
jazzsonic.c
Kconfig	Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2006-06-22 22:15:09 -07:00
lance.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
lasi_82596.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
LICENSE.SRC
lne390.c
loopback.c	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
lp486e.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
mac89x0.c
mac8390.c
mace.c
mace.h
macmace.c
macsonic.c
Makefile	[PATCH] network driver for Hilscher netx	2006-06-22 23:28:05 -04:00
meth.c
meth.h
mii.c
mipsnet.c
mipsnet.h
mv643xx_eth.c
mv643xx_eth.h
mvme147.c
myri_code.h
myri_sbus.c	[NET] myri_sbus: Convert to new SBUS device layer.	2006-06-23 23:16:07 -07:00
myri_sbus.h	[NET] myri_sbus: Kill unused next_module struct member.	2006-06-23 23:16:09 -07:00
natsemi.c	[netdrvr] natsemi: minor cleanups	2006-06-26 22:48:38 -04:00
ne-h8300.c
ne.c
ne2.c
ne2k-pci.c
ne3210.c
netconsole.c
netx-eth.c	[PATCH] network driver for Hilscher netx	2006-06-22 23:28:05 -04:00
ni52.c
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
ns83820.c
oaknet.c
pci-skeleton.c
pcnet32.c	[netdrvr] Remove long-unused bits from Becker template drivers	2006-06-26 23:47:50 -04:00
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c	[PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree	2006-06-26 12:25:08 -07:00
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c
pppox.c
r8169.c	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
rionet.c
rrunner.c
rrunner.h
s2io-regs.h
s2io.c	[NET]: Merge TSO/UFO fields in sk_buff	2006-06-23 02:07:29 -07:00
s2io.h
saa9730.c
saa9730.h
sb1000.c
sb1250-mac.c
seeq8005.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
seeq8005.h
sgiseeq.c
sgiseeq.h
shaper.c
sis190.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
sis900.c
sis900.h
sk_mca.c
sk_mca.h
skge.c	[PATCH] 64bit resource: fix up printks for resources in networks drivers	2006-06-27 09:23:58 -07:00
skge.h
sky2.c	[PATCH] 64bit resource: fix up printks for resources in networks drivers	2006-06-27 09:23:58 -07:00
sky2.h
slhc.c
slip.c
slip.h
smc-mca.c
smc-ultra.c
smc-ultra32.c
smc91x.c
smc91x.h
smc911x.c
smc911x.h
smc9194.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
smc9194.h
sonic.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
sonic.h
Space.c
spider_net.c
spider_net.h
spider_net_ethtool.c
starfire.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
starfire_firmware.h
starfire_firmware.pl
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c	[PATCH] m68k: cleanup generic irq names	2006-06-25 10:00:57 -07:00
sunbmac.c	[NET] sunbmac: Convert over to new SBUS device framework.	2006-06-23 23:16:02 -07:00
sunbmac.h	[NET] sunbmac: Convert over to new SBUS device framework.	2006-06-23 23:16:02 -07:00
sundance.c
sungem.c	[SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.	2006-06-23 23:15:26 -07:00
sungem.h
sungem_phy.c
sungem_phy.h
sunhme.c	[SUNHME]: Mark SBUS probing routines as __devinit.	2006-06-29 16:38:05 -07:00
sunhme.h	[NET] sunhme: Convert to new SBUS driver framework.	2006-06-23 23:15:58 -07:00
sunlance.c	[NET] sunlance: Convert to new SBUS driver framework.	2006-06-23 23:16:00 -07:00
sunqe.c	[NET] sunqe: Convert to new SBUS driver layer.	2006-06-23 23:16:04 -07:00
sunqe.h
tc35815.c
tg3.c	[SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.	2006-06-23 23:15:26 -07:00
tg3.h
tlan.c
tlan.h
tun.c	[PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed	2006-06-26 12:25:08 -07:00
typhoon-firmware.h
typhoon.c	[PATCH] 64bit resource: fix up printks for resources in networks drivers	2006-06-27 09:23:58 -07:00
typhoon.h
via-rhine.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
via-velocity.c	via-velocity: the link is not correctly detected when the device starts	2006-06-23 01:18:35 +02:00
via-velocity.h
wd.c
yellowfin.c	[netdrvr] Remove long-unused bits from Becker template drivers	2006-06-26 23:47:50 -04:00
znet.c	[NET]: Avoid allocating skb in skb_pad	2006-06-23 02:06:41 -07:00
zorro8390.c