David S. Miller 0344f1c66b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/mac80211/tx.c		2008-06-19 16:00:04 -07:00
..
appletalk	fix warning in drivers/net/appletalk/cops.c	2008-05-06 12:16:24 -04:00
arcnet	…
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-30 08:45:48 -07:00
atlx	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-19 16:00:04 -07:00
bonding	bonding: Allow setting max_bonds to zero	2008-06-18 00:00:04 -04:00
can	…
chelsio	…
cris	…
cxgb3	cxgb3 - Add LRO support	2008-05-22 06:34:13 -04:00
e1000	e1000: convert uint16_t style integers to u16	2008-04-16 20:41:45 -04:00
e1000e	e1000e: allow VLAN devices to use TSO and TCP CSUM offload	2008-06-11 21:58:43 -04:00
ehea	net: Eliminate flush_scheduled_work() calls while RTNL is held.	2008-06-12 02:22:02 -07:00
fec_8xx	…
fs_enet	fs_enet: MDIO on GPIO support	2008-05-30 22:18:33 -04:00
hamradio	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
ibm_newemac	ibm_newemac: select CRC32 in Kconfig	2008-06-17 23:06:56 -04:00
igb	igb: allow vlan devices to use TSO and TCP CSUM offload	2008-06-11 21:58:42 -04:00
irda	irda: remove CVS keywords	2008-06-11 21:00:41 -07:00
ixgb	ixgb: convert uint16_t style integers to u16	2008-04-16 20:41:44 -04:00
ixgbe	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
ixp2000	ixp2000: use netdev_alloc_skb	2008-05-22 14:12:39 -04:00
mlx4	mlx4_core: Support creation of FMRs with pages smaller than 4K	2008-05-05 15:56:52 -07:00
myri10ge	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-10 02:22:26 -07:00
netxen	netxen: download firmware in pci probe	2008-06-17 23:07:01 -04:00
pcmcia	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-25 23:26:10 -07:00
phy	net: OpenFirmware GPIO based MDIO bitbang driver	2008-05-30 22:18:25 -04:00
sfc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
skfp	…
tokenring	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-25 23:26:10 -07:00
tulip	net: Eliminate flush_scheduled_work() calls while RTNL is held.	2008-06-12 02:22:02 -07:00
usb	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
wan	WAN: protect HDLC proto list while insmod/rmmod	2008-05-22 06:26:32 -04:00
wireless	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-16 18:25:48 -07:00
3c59x.c	3c59x: use netstats in net_device structure	2008-05-06 12:22:11 -04:00
3c501.c	…
3c501.h	…
3c503.c	…
3c503.h	…
3c505.c	3c505: use netstats in net_device structure	2008-04-29 01:55:11 -04:00
3c505.h	3c505: use netstats in net_device structure	2008-04-29 01:55:11 -04:00
3c507.c	…
3c509.c	Merge branch 'upstream-next-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6	2008-05-29 03:31:03 -07:00
3c515.c	3c515: fix using pnp_get_resource when CONFIG_ISAPNP=n	2008-05-22 06:34:34 -04:00
3c523.c	3c523: use netstats in net_device structure	2008-05-13 01:35:24 -04:00
3c523.h	…
3c527.c	3c527: use netstats in net_device structure	2008-05-13 01:35:25 -04:00
3c527.h	…
7990.c	add missing lance_* exports	2008-06-10 18:20:17 -04:00
7990.h	…
8139cp.c	8139cp: use netstats in net_device structure	2008-05-13 01:35:23 -04:00
8139too.c	8139too: use netstats in net_device structure	2008-05-13 01:35:24 -04:00
8390.c	net: fix returning void-valued expression warnings	2008-05-01 02:47:38 -07:00
8390.h	8390.h: remove net_device_stats	2008-05-13 01:35:23 -04:00
82596.c	m68k: Some network drivers do not check the platform	2008-05-18 13:28:49 -07:00
Kconfig	ibm_emac: Remove the ibm_emac driver	2008-06-17 23:59:01 -04:00
LICENSE.SRC	…
Makefile	ibm_emac: Remove the ibm_emac driver	2008-06-17 23:59:01 -04:00
Space.c	…
a2065.c	drivers/net/: remove write-only "last_dev"	2008-06-11 21:58:34 -04:00
a2065.h	…
ac3200.c	…
acenic.c	acenic: use netstats in net_device structure	2008-05-13 01:35:24 -04:00
acenic.h	acenic: use netstats in net_device structure	2008-05-13 01:35:24 -04:00
acenic_firmware.h	…
amd8111e.c	…
amd8111e.h	…
apne.c	m68k: Some network drivers do not check the platform	2008-05-18 13:28:49 -07:00
ariadne.c	…
ariadne.h	…
at1700.c	…
atarilance.c	make drivers/net/atarilance.c:lance_addr_list[] static	2008-06-11 21:58:32 -04:00
atp.c	…
atp.h	…
au1000_eth.c	au1000_eth: remove useless check	2008-05-22 06:20:14 -04:00
au1000_eth.h	…
ax88796.c	net drivers: fix platform driver hotplug/coldplug	2008-04-25 02:08:54 -04:00
b44.c	…
b44.h	…
bfin_mac.c	Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>	2008-05-22 06:20:11 -04:00
bfin_mac.h	Blackfin EMAC Driver: code cleanup	2008-04-29 01:56:14 -04:00
bmac.c	…
bmac.h	…
bnx2.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
bnx2.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
bnx2_fw.h	bnx2: Pre-initialize struct cpu_reg.	2008-05-16 22:20:27 -07:00
bnx2_fw2.h	bnx2: Update RV2P firmware for 5709.	2008-05-02 16:57:59 -07:00
bnx2x.c	bnx2x: Updating the Maintainer	2008-06-12 14:30:28 -07:00
bnx2x.h	bnx2x: Updating the Maintainer	2008-06-12 14:30:28 -07:00
bnx2x_fw_defs.h	…
bnx2x_hsi.h	…
bnx2x_init.h	bnx2x: Updating the Maintainer	2008-06-12 14:30:28 -07:00
bnx2x_init_values.h	…
bnx2x_reg.h	…
bsd_comp.c	…
cassini.c	cassini: Only use chip checksum for ipv4 packets.	2008-05-21 17:05:34 -07:00
cassini.h	…
cpmac.c	cpmac bugfixes and enhancements	2008-05-22 06:20:02 -04:00
cs89x0.c	[netdrvr] CS89X0: Add cleanup for dma after fail	2008-05-30 22:07:11 -04:00
cs89x0.h	…
de600.c	…
de600.h	…
de620.c	…
de620.h	…
declance.c	drivers/net/: remove write-only "last_dev"	2008-06-11 21:58:34 -04:00
defxx.c	…
defxx.h	…
depca.c	…
depca.h	…
dl2k.c	dl2k: use netdev_alloc_skb	2008-05-22 14:12:45 -04:00
dl2k.h	…
dm9000.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-25 23:26:10 -07:00
dm9000.h	…
dummy.c	…
e100.c	net: use get/put_unaligned_* helpers	2008-04-29 08:06:27 -07:00
e2100.c	…
eepro.c	net: eepro autoport typo	2008-04-29 01:56:01 -04:00
eepro100.c	…
eexpress.c	[netdrvr] eexpress: IPv6 fails - multicast problems	2008-05-06 12:22:34 -04:00
eexpress.h	…
enc28j60.c	net/enc28j60: low power mode	2008-06-17 23:07:29 -04:00
enc28j60_hw.h	…
epic100.c	…
eql.c	…
es3210.c	…
eth16i.c	…
ewrk3.c	…
ewrk3.h	…
fealnx.c	…
fec.c	m68knommu: fix FEC driver locking	2008-05-01 08:08:36 -07:00
fec.h	m68knommu: fix ColdFire 5272 fec driver hash registers	2008-05-01 08:08:36 -07:00
fec_mpc52xx.c	fec_mpc52xx: MPC52xx_MESSAGES_DEFAULT: 2nd NETIF_MSG_IFDOWN => IFUP	2008-06-11 22:24:42 -04:00
fec_mpc52xx.h	[POWERPC] mpc5200: Allow for fixed speed MII configurations	2008-05-01 11:05:58 -06:00
fec_mpc52xx_phy.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-04-17 23:56:30 -07:00
forcedeth.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
gianfar.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-15 00:34:44 -07:00
gianfar.h	gianfar: Fix a locking bug in gianfar's sysfs code	2008-05-06 12:01:34 -04:00
gianfar_ethtool.c	…
gianfar_mii.c	[netdrvr] gianfar: Determine TBIPA value dynamically	2008-04-29 01:57:57 -04:00
gianfar_mii.h	[netdrvr] gianfar: Determine TBIPA value dynamically	2008-04-29 01:57:57 -04:00
gianfar_sysfs.c	gianfar: Fix a locking bug in gianfar's sysfs code	2008-05-06 12:01:34 -04:00
hamachi.c	hamachi: use netdev_alloc_skb	2008-05-22 14:12:40 -04:00
hp-plus.c	…
hp.c	…
hp100.c	…
hp100.h	…
hplance.c	make hplance_{init,cleanup}_module() static	2008-06-11 21:58:32 -04:00
hplance.h	…
hydra.c	…
ibmlana.c	…
ibmlana.h	…
ibmveth.c	netdev: use non-racy method for proc entries creation	2008-04-29 08:06:22 -07:00
ibmveth.h	…
ifb.c	…
ioc3-eth.c	…
ipg.c	ipg: fix receivemode IPG_RM_RECEIVEMULTICAST{,HASH} in ipg_nic_set_multicast_list()	2008-06-11 22:24:40 -04:00
ipg.h	…
isa-skeleton.c	…
iseries_veth.c	[POWERPC] properly declare onstack completion in iseries veth	2008-04-17 07:46:11 +10:00
jazzsonic.c	net drivers: fix platform driver hotplug/coldplug	2008-04-25 02:08:54 -04:00
korina.c	korina: misc cleanup	2008-04-25 02:08:51 -04:00
lance.c	…
lasi_82596.c	…
lib8390.c	[netdrvr] Fix 8390 build breakage	2008-06-11 22:06:31 -04:00
lib82596.c	…
lne390.c	…
loopback.c	…
lp486e.c	…
mac89x0.c	m68k: Some network drivers do not check the platform	2008-05-18 13:28:49 -07:00
mac8390.c	drivers/net/mac8390.c: make functions static	2008-06-11 21:58:33 -04:00
macb.c	macb: use random mac if stored address in EEPROM is invalid	2008-06-11 21:58:28 -04:00
macb.h	…
mace.c	…
mace.h	…
macmace.c	m68k: Some network drivers do not check the platform	2008-05-18 13:28:49 -07:00
macsonic.c	drivers/net/macsonic.c: make functions static	2008-06-11 21:58:37 -04:00
macvlan.c	macvlan: Fix memleak on device removal/crash on module removal	2008-05-08 01:13:31 -07:00
meth.c	net drivers: fix platform driver hotplug/coldplug	2008-04-25 02:08:54 -04:00
meth.h	…
mii.c	…
mipsnet.c	…
mv643xx_eth.c	mv643xx_eth: update driver version and author fields	2008-06-12 08:40:39 +02:00
mvme147.c	…
myri_code.h	…
myri_sbus.c	…
myri_sbus.h	…
natsemi.c	[netdrvr] Trim trailing whitespace for several drivers	2008-05-13 01:41:58 -04:00
ne-h8300.c	…
ne.c	…
ne2.c	…
ne2k-pci.c	…
ne3210.c	…
netconsole.c	…
netx-eth.c	net drivers: fix platform driver hotplug/coldplug	2008-04-25 02:08:54 -04:00
ni52.c	…
ni52.h	…
ni65.c	…
ni65.h	…
ni5010.c	…
ni5010.h	…
niu.c	niu: Determine the # of ports from the card's VPD data	2008-05-12 03:10:59 -07:00
niu.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-15 00:34:44 -07:00
ns83820.c	ns8320: use netdev_alloc_skb	2008-05-30 22:19:22 -04:00
pasemi_mac.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-04-21 15:50:49 -07:00
pasemi_mac.h	…
pasemi_mac_ethtool.c	…
pci-skeleton.c	…
pcnet32.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-25 23:26:10 -07:00
plip.c	…
ppp_async.c	tty: add throttle/unthrottle helpers	2008-04-30 08:29:47 -07:00
ppp_deflate.c	…
ppp_generic.c	ppp: push BKL down into the driver	2008-05-25 23:40:58 -07:00
ppp_mppe.c	…
ppp_mppe.h	…
ppp_synctty.c	tty: add throttle/unthrottle helpers	2008-04-30 08:29:47 -07:00
pppoe.c	pppoe: Unshare skb before anything else	2008-06-10 14:08:25 -07:00
pppol2tp.c	l2tp: Fix potential memory corruption in pppol2tp_recvmsg()	2008-06-10 12:35:00 -07:00
pppox.c	…
ps3_gelic_net.c	ps3: gelic: updown_lock semaphore to mutex	2008-06-03 15:00:14 -04:00
ps3_gelic_net.h	ps3: gelic: updown_lock semaphore to mutex	2008-06-03 15:00:14 -04:00
ps3_gelic_wireless.c	PS3: gelic: Add support for ESSID scan	2008-06-03 15:00:28 -04:00
ps3_gelic_wireless.h	PS3: gelic: Kill the static bounce buffer	2008-06-03 15:00:27 -04:00
qla3xxx.c	[netdrvr] Trim trailing whitespace for several drivers	2008-05-13 01:41:58 -04:00
qla3xxx.h	…
r6040.c	drivers/net/r6040.c: correct bad use of round_jiffies()	2008-06-11 22:25:38 -04:00
r8169.c	r8169: fix oops in r8169_get_mac_version	2008-04-17 22:48:41 +02:00
rionet.c	[RAPIDIO] Auto-probe the RapidIO system size	2008-04-29 19:40:28 +10:00
rrunner.c	…
rrunner.h	…
s2io-regs.h	S2io: Added napi support when MSIX is enabled.	2008-05-22 06:26:21 -04:00
s2io.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
s2io.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-25 23:26:10 -07:00
saa9730.c	…
saa9730.h	…
sb1000.c	sb1000.c: make const arrays static	2008-04-16 20:41:44 -04:00
sb1250-mac.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-25 23:26:10 -07:00
sc92031.c	sc92031: remove bogus unlikely()	2008-05-30 22:07:17 -04:00
seeq8005.c	…
seeq8005.h	…
sgiseeq.c	net drivers: fix platform driver hotplug/coldplug	2008-04-25 02:08:54 -04:00
sgiseeq.h	…
sh_eth.c	net: sh_eth: add support for Renesas SuperH Ethernet	2008-06-11 21:58:25 -04:00
sh_eth.h	net: sh_eth: add support for Renesas SuperH Ethernet	2008-06-11 21:58:25 -04:00
sis190.c	[netdrvr] Trim trailing whitespace for several drivers	2008-05-13 01:41:58 -04:00
sis900.c	[netdrvr] Trim trailing whitespace for several drivers	2008-05-13 01:41:58 -04:00
sis900.h	…
skge.c	…
skge.h	…
sky2.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-19 16:00:04 -07:00
sky2.h	sky2: 88E8057 chip support	2008-06-17 23:59:39 -04:00
slhc.c	…
slip.c	tty: The big operations rework	2008-04-30 08:29:47 -07:00
slip.h	…
smc-mca.c	…
smc-ultra.c	…
smc-ultra32.c	…
smc91x.c	net: Eliminate flush_scheduled_work() calls while RTNL is held.	2008-06-12 02:22:02 -07:00
smc91x.h	smc91x: fix build error from the SMC_GET_MAC_ADDR API change	2008-06-11 08:38:18 -07:00
smc911x.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
smc911x.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-13 20:52:39 -07:00
smc9194.c	…
smc9194.h	…
sni_82596.c	net drivers: fix platform driver hotplug/coldplug	2008-04-25 02:08:54 -04:00
sonic.c	…
sonic.h	…
spider_net.c	[netdrvr] Trim trailing whitespace for several drivers	2008-05-13 01:41:58 -04:00
spider_net.h	spidernet: change interrupt masks	2008-04-16 20:06:50 -04:00
spider_net_ethtool.c	…
starfire.c	…
starfire_firmware.h	…
starfire_firmware.pl	…
stnic.c	…
sun3_82586.c	…
sun3_82586.h	…
sun3lance.c	m68k: Some network drivers do not check the platform	2008-05-18 13:28:49 -07:00
sunbmac.c	…
sunbmac.h	…
sundance.c	…
sungem.c	…
sungem.h	…
sungem_phy.c	…
sungem_phy.h	…
sunhme.c	sunhme: Cleanup use of deprecated calls to save_and_cli and restore_flags.	2008-06-04 12:06:28 -07:00
sunhme.h	…
sunlance.c	drivers/net/: remove write-only "last_dev"	2008-06-11 21:58:34 -04:00
sunqe.c	…
sunqe.h	…
sunvnet.c	…
sunvnet.h	…
tc35815.c	tc35815: Statistics cleanup	2008-04-17 15:31:31 -04:00
tehuti.c	drivers/net/tehuti: use proper capability check for raw IO access	2008-04-29 11:45:16 -07:00
tehuti.h	…
tehuti_fw.h	…
tg3.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-10 02:22:26 -07:00
tg3.h	tg3: Add shmem options.	2008-05-29 01:38:46 -07:00
tlan.c	tlan: wrap source lines	2008-05-30 22:18:02 -04:00
tlan.h	tlan: wrap source lines	2008-05-30 22:18:02 -04:00
tsi108_eth.c	ts108: use netdev_alloc_skb	2008-05-30 22:19:21 -04:00
tsi108_eth.h	…
tun.c	tun: Proper handling of IPv6 header in tun driver when TUN_NO_PI is set	2008-06-17 21:10:33 -07:00
typhoon-firmware.h	…
typhoon.c	[netdrvr] typhoon: typhoon_resume - remove call to start_queue	2008-04-25 02:08:08 -04:00
typhoon.h	…
ucc_geth.c	ucc_geth: Fix arguments to dma map/unmap functions	2008-05-22 06:19:24 -04:00
ucc_geth.h	ucc_geth: Fix a bunch of sparse warnings	2008-05-06 12:02:08 -04:00
ucc_geth_ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-06-10 02:22:26 -07:00
ucc_geth_mii.c	ucc_geth: Fix a bunch of sparse warnings	2008-05-06 12:02:08 -04:00
ucc_geth_mii.h	…
veth.c	…
via-rhine.c	…
via-velocity.c	via-velocity: use memmove	2008-05-22 14:12:55 -04:00
via-velocity.h	…
virtio_net.c	virtio: use callback on empty in virtio_net	2008-06-10 18:20:32 -04:00
wd.c	…
xen-netfront.c	NETFRONT: Use __skb_queue_purge()	2008-05-22 14:01:03 -04:00
yellowfin.c	net: use get/put_unaligned_* helpers	2008-04-29 08:06:27 -07:00
znet.c	…
zorro8390.c	…