Linus Torvalds a84216e671 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (21 commits) mac80211: check interface is down before type change cfg80211: fix NULL ptr deref libertas if_usb: Fix crash on 64-bit machines mac80211: fix reason code output endianness mac80211: fix addba timer ath9k: fix misplaced semicolon on rate control b43: Fix DMA TX bounce buffer copying mac80211: fix BSS leak rt73usb.c : more ids ipw2200: fix oops on missing firmware gre: Fix dev_addr clobbering for gretap sky2: set carrier off in probe net: fix sk_forward_alloc corruption pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card r8169: Fix card drop incoming VLAN tagged MTU byte large jumbo frames ibmtr: possible Read buffer overflow? net: Fix RPF to work with policy routing net: fix kmemcheck annotations e1000e: rework disable K1 at 1000Mbps for 82577/82578 e1000e: config PHY via software after resets ...		2009-11-03 07:44:01 -08:00
..
appletalk
arcnet	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
arm
atl1c	atl1c:remove compiling warning	2009-09-22 14:00:10 -07:00
atl1e	atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA	2009-09-17 10:27:28 -07:00
atlx
benet	be2net: fix support for PCI hot plug	2009-10-14 23:29:56 -07:00
bonding	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-29 09:22:08 -07:00
can	net: Fix OF platform drivers coldplug/hotplug when compiled as modules	2009-10-14 14:54:52 -07:00
chelsio
cris	Merge branch 'for-linus' of git://repo.or.cz/cris-mirror	2009-09-24 17:08:56 -07:00
cxgb3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-09-14 10:37:28 -07:00
e1000	e1000: cleanup unused prototype	2009-09-26 20:16:05 -07:00
e1000e	e1000e: rework disable K1 at 1000Mbps for 82577/82578	2009-10-29 22:48:39 -07:00
ehea	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-09-24 15:13:11 -07:00
enic
fs_enet	net: Fix OF platform drivers coldplug/hotplug when compiled as modules	2009-10-14 14:54:52 -07:00
hamradio	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
ibm_newemac	net: Fix OF platform drivers coldplug/hotplug when compiled as modules	2009-10-14 14:54:52 -07:00
igb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-29 09:22:08 -07:00
igbvf	igbvf: fix memory leak when ring size changed while interface down	2009-10-26 16:09:01 -07:00
irda	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-15 15:03:17 -07:00
ixgb
ixgbe	ixgbe: fix memory leak when resizing rings while interface is down	2009-10-26 16:08:59 -07:00
ixp2000	net: Fix IXP 2000 network driver building.	2009-10-13 00:03:11 -07:00
mlx4	mlx4_core: Add a new supported 40 GigE device ID	2009-10-14 10:52:40 -07:00
myri10ge	myri10ge: improve port type reporting in ethtool	2009-10-22 21:43:43 -07:00
netxen	netxen: avoid undue board config check	2009-10-22 18:27:50 -07:00
pcmcia	pcnet_cs: add cis of PreMax PE-200 ethernet pcmcia card	2009-10-29 22:51:25 -07:00
phy	net: Fix OF platform drivers coldplug/hotplug when compiled as modules	2009-10-14 14:54:52 -07:00
qlge	qlge: Fix firmware mailbox command timeout.	2009-10-29 01:17:15 -07:00
sfc	sfc: Set ip_summed correctly for page buffers passed to GRO	2009-10-28 03:43:49 -07:00
skfp	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
stmmac	net: add support for STMicroelectronics Ethernet controllers.	2009-10-14 15:13:45 -07:00
tokenring	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-03 07:44:01 -08:00
tulip
usb	USB: rndis_host: debug info clobbered before it is logged	2009-10-30 14:57:33 -07:00
vmxnet3	vmxnet3: use dev_dbg, fix build for CONFIG_BLOCK=n	2009-10-16 17:54:34 -07:00
vxge	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
wan	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-15 15:03:17 -07:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-03 07:44:01 -08:00
3c59x.c	3c59x: Rework suspend and resume	2009-09-30 20:11:11 -07: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	8139cp: fix duplicate loglevel in module load message	2009-09-22 14:00:15 -07:00
8139too.c
8390.c
8390.h
8390p.c
82596.c
a2065.c
a2065.h
ac3200.c
acenic.c	acenic: Pass up error code from ace_load_firmware()	2009-10-12 04:18:48 -07:00
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c
atp.h
au1000_eth.c	net: au1000_eth: add missing capability.h	2009-10-22 21:51:27 -07:00
au1000_eth.h
ax88796.c
b44.c	b44: the poll handler b44_poll must not enable IRQ unconditionally	2009-09-16 20:49:47 -07:00
b44.h
bcm63xx_enet.c	bcm63xx_enet: timeout off by one in do_mdio_op()	2009-09-30 20:03:15 -07:00
bcm63xx_enet.h	MIPS: BCM63xx: Add integrated ethernet mac support.	2009-09-17 20:07:53 +02:00
bfin_mac.c
bfin_mac.h
bmac.c
bmac.h
bnx2_fw.h
bnx2.c
bnx2.h	cnic: Fix L2CTX_STATUSB_NUM offset in context memory.	2009-10-28 03:41:59 -07:00
bnx2x_dump.h
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h
bnx2x_init_ops.h
bnx2x_init.h
bnx2x_link.c
bnx2x_link.h
bnx2x_main.c
bnx2x_reg.h	trivial: fix typo "for for" in multiple files	2009-09-21 15:14:54 +02:00
bnx2x.h
bsd_comp.c
cassini.c
cassini.h
cnic_defs.h
cnic_if.h	cnic: Fix NETDEV_UP event processing.	2009-10-02 11:03:28 -07:00
cnic.c	cnic: Fix L2CTX_STATUSB_NUM offset in context memory.	2009-10-28 03:41:59 -07:00
cnic.h
cpmac.c	cpmac: fix compilation errors against undeclared BUS_ID_SIZE	2009-09-21 11:32:23 -07:00
cs89x0.c
cs89x0.h
davinci_emac.c	TI DaVinci EMAC: Clear statistics register properly.	2009-10-13 12:02:53 -07:00
de600.c
de600.h
de620.c
de620.h
declance.c
defxx.c
defxx.h
depca.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
depca.h
dl2k.c
dl2k.h
dm9000.c
dm9000.h	DM9000: Fix revision ID for DM9000B	2009-10-24 06:53:07 -07:00
dnet.c
dnet.h
dummy.c
e100.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-11-03 07:44:01 -08:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60_hw.h
enc28j60.c	spi: prefix modalias with "spi:"	2009-09-23 07:39:43 -07:00
epic100.c
eql.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
es3210.c
eth16i.c
ethoc.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-23 07:34:23 +09:00
ewrk3.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
ewrk3.h
fealnx.c
fec_mpc52xx_phy.c	net: Fix OF platform drivers coldplug/hotplug when compiled as modules	2009-10-14 14:54:52 -07:00
fec_mpc52xx.c	net/fec_mpc52xx: Fix kernel panic on FEC error	2009-10-14 15:10:19 -07:00
fec_mpc52xx.h
fec.c	net: fix section mismatch in fec.c	2009-10-20 18:51:37 -07:00
fec.h
forcedeth.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
fsl_pq_mdio.c	net: Fix OF platform drivers coldplug/hotplug when compiled as modules	2009-10-14 14:54:52 -07:00
fsl_pq_mdio.h
gianfar_ethtool.c	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
gianfar_sysfs.c
gianfar.c	net: Fix OF platform drivers coldplug/hotplug when compiled as modules	2009-10-14 14:54:52 -07:00
gianfar.h
hamachi.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
hp100.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
hp100.h
hp-plus.c
hp.c
hplance.c
hplance.h
hydra.c
ibmlana.c
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c	ifb: should not use __dev_get_by_index() without locks	2009-10-22 21:54:19 -07:00
ioc3-eth.c
ipg.c
ipg.h
isa-skeleton.c
iseries_veth.c	net: Fix wrong sizeof	2009-10-02 09:55:19 -07:00
jazzsonic.c
jme.c
jme.h
Kconfig	vmxnet: fix 2 build problems	2009-10-14 20:38:58 -07:00
korina.c
ks8842.c
ks8851_mll.c	drivers/net: ks8851_mll ethernet network driver	2009-09-30 20:03:57 -07:00
ks8851.c	KS8851: Fix ks8851_set_rx_mode() for IFF_MULTICAST	2009-10-20 19:11:07 -07:00
ks8851.h	KS8851: Fix MAC address write order	2009-10-20 19:11:06 -07:00
lance.c
lasi_82596.c
lib8390.c
lib82596.c
LICENSE.SRC
ll_temac_main.c	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
ll_temac_mdio.c
ll_temac.h
lne390.c
loopback.c
lp486e.c
mac89x0.c
mac8390.c
macb.c	trivial: fix typos "man[ae]g?ment" -> "management"	2009-09-21 15:14:56 +02:00
macb.h
mace.c
mace.h
macmace.c
macsonic.c
macvlan.c
Makefile	net: add support for STMicroelectronics Ethernet controllers.	2009-10-14 15:13:45 -07:00
mdio.c
meth.c	don't use __devexit_p to wrap meth_remove	2009-10-01 14:34:40 -07:00
meth.h
mii.c
mipsnet.c
mv643xx_eth.c
mvme147.c
myri_sbus.c
myri_sbus.h
natsemi.c
ne2.c
ne2k-pci.c
ne3210.c
ne-h8300.c
ne.c
netconsole.c
netx-eth.c
ni52.c	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
ni52.h
ni65.c
ni65.h
ni5010.c
ni5010.h
niu.c	niu: VLAN_ETH_HLEN should be used to make sure that the whole MAC header was copied to the head buffer in the Vlan packets case	2009-10-21 17:21:10 -07:00
niu.h
ns83820.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
pasemi_mac_ethtool.c	pasemi_mac: ethtool get settings fix	2009-10-07 03:37:43 -07:00
pasemi_mac.c
pasemi_mac.h
pci-skeleton.c
pcnet32.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
plip.c
ppp_async.c
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c
pppoe.c	PPPoE: Fix flush/close races.	2009-10-26 16:23:20 -07:00
pppol2tp.c	net: Make setsockopt() optlen be unsigned.	2009-09-30 16:12:20 -07:00
pppox.c
ps3_gelic_net.c
ps3_gelic_net.h
ps3_gelic_wireless.c
ps3_gelic_wireless.h
qla3xxx.c
qla3xxx.h
r6040.c
r8169.c	r8169: Fix card drop incoming VLAN tagged MTU byte large jumbo frames	2009-10-29 22:49:23 -07:00
rionet.c	trivial: fix typo "for for" in multiple files	2009-09-21 15:14:54 +02:00
rrunner.c
rrunner.h
s2io-regs.h
s2io.c
s2io.h
s6gmac.c
sb1000.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
sb1250-mac.c
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c	don't use __devexit_p to wrap sgiseeq_remove	2009-10-01 14:34:43 -07:00
sgiseeq.h
sh_eth.c	sh_eth: Add asm/cacheflush.h	2009-10-26 17:19:44 -07:00
sh_eth.h
sis190.c
sis900.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
sis900.h
skge.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
skge.h	skge: use unique IRQ name	2009-10-01 15:14:54 -07:00
sky2.c	sky2: set carrier off in probe	2009-10-30 12:25:16 -07:00
sky2.h	sky2: irqname based on pci address	2009-10-01 15:14:55 -07:00
slhc.c
slip.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
slip.h
smc91x.c	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
smc91x.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-09-17 20:53:52 -07:00
smc911x.c
smc911x.h
smc9194.c
smc9194.h
smc-mca.c
smc-ultra32.c
smc-ultra.c
smsc911x.c
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c
sonic.h
Space.c
spider_net_ethtool.c
spider_net.c
spider_net.h
starfire.c
stnic.c
sun3_82586.c
sun3_82586.h
sun3lance.c
sunbmac.c
sunbmac.h
sundance.c
sungem_phy.c
sungem_phy.h
sungem.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
sungem.h
sunhme.c
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c	drivers/net: remove duplicate structure field initialization	2009-09-22 14:00:09 -07:00
sunvnet.h
tc35815.c
tehuti.c
tehuti.h
tg3.c	tg3: Fix phylib locking strategy	2009-10-07 03:37:39 -07:00
tg3.h	tg3: Fix phylib locking strategy	2009-10-07 03:37:39 -07:00
tlan.c
tlan.h
tsi108_eth.c
tsi108_eth.h
tun.c	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2009-09-24 15:13:11 -07:00
typhoon.c	headers: remove sched.h from interrupt.h	2009-10-11 11:20:58 -07:00
typhoon.h
ucc_geth_ethtool.c
ucc_geth.c
ucc_geth.h
veth.c
via-rhine.c
via-velocity.c
via-velocity.h
virtio_net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-10-29 09:22:08 -07:00
wd.c
xen-netfront.c
xilinx_emaclite.c	net: xilinx_emaclite: Fix problem with first incoming packet	2009-09-22 14:00:04 -07:00
xtsonic.c
yellowfin.c
znet.c	znet: Don't claim DMA lock around free_dma() calls.	2009-10-07 22:15:23 -07:00
zorro8390.c