Linus Torvalds e864561c12 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: (29 commits) cxgb3: Fix crash caused by stashing wrong netdev_queue ixgbe: Fix coexistence of FCoE and Flow Director in 82599 memory barrier: adding smp_mb__after_lock net: adding memory barrier to the poll and receive callbacks netpoll: Fix carrier detection for drivers that are using phylib includecheck fix: include/linux, rfkill.h p54: tx refused but queue active Atheros Kconfig needs to be dependent on WLAN_80211 mac80211: fix docbook mac80211_hwsim: avoid NULL access ssb: Add support for 4318E b43: Add support for 4318E zd1211rw: adding SONY IFU-WLM2 (054c:0257) as a zd1211b device zd1211rw: 07b8:6001 is a ZD1211B r6040: bump driver version to 0.24 and date to 08 July 2009 r6040: restore MIER register correctly when IRQ line is shared ipv4: Fix fib_trie rebalancing, part 4 (root thresholds) davinci_emac: fix kernel oops when changing MAC address while interface is down igb: set lan id prior to configuring phy mac80211: minstrel: avoid accessing negative indices in rix_to_ndx() ...		2009-07-09 20:33:18 -07:00
..
appletalk	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
arcnet	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
arm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
atl1c	atl1*: add device_set_wakeup_enable to atl1*_set_wol	2009-06-25 02:58:17 -07:00
atl1e	atl1*: add device_set_wakeup_enable to atl1*_set_wol	2009-06-25 02:58:17 -07:00
atlx	net: ntohs() misuse	2009-06-11 17:23:24 -07:00
benet	be2net: fix spurious interrupt handling in intx mode	2009-07-03 20:09:45 -07:00
bonding	bonding: initialization rework	2009-06-13 23:29:04 -07:00
can	can: let SJA1000 driver depend on HAS_IOMEM	2009-06-23 04:16:44 -07:00
chelsio
cris
cxgb3	cxgb3: Fix crash caused by stashing wrong netdev_queue	2009-07-09 17:16:06 -07:00
e1000	e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error	2009-06-30 19:47:00 -07:00
e1000e	e1000e: disable K1 at 1000Mbps for 82577/82578	2009-07-03 20:09:42 -07:00
ehea	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
enic
fs_enet
hamradio	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
ibm_newemac	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
igb	igb: set lan id prior to configuring phy	2009-07-08 10:46:43 -07:00
igbvf	convert some DMA_nnBIT_MASK() callers	2009-06-19 16:46:06 -07:00
irda	net/irda: convert bfin_sir to net_device_ops	2009-06-29 19:41:49 -07:00
ixgb	net: skb_shared_info optimization	2009-06-08 00:21:48 -07:00
ixgbe	ixgbe: Fix coexistence of FCoE and Flow Director in 82599	2009-07-09 17:16:05 -07:00
ixp2000
mlx4	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband	2009-06-23 11:36:01 -07:00
myri10ge	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
netxen	netxen: avoid frequent firmware reset	2009-07-02 13:16:51 -07:00
pcmcia	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
phy	phylib: fixes for PHY_RESUMING state changes	2009-07-02 13:16:55 -07:00
qlge	qlge: Fix sizeof usage.	2009-07-03 19:10:51 -07:00
sfc	sfc: Expose 100/1000BASE-T MDI-X status via ethtool	2009-06-11 02:47:11 -07:00
skfp	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
tokenring	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
tulip	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
usb	usbnet: Use netdev stats structure	2009-06-30 19:46:48 -07:00
vxge	vxge: Enable SRIOV support in the driver.	2009-06-17 04:31:14 -07:00
wan	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
wimax	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-09 20:33:18 -07:00
3c59x.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c501.c
3c501.h
3c503.c
3c503.h
3c505.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c505.h
3c507.c
3c509.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
3c515.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c523.c
3c523.h
3c527.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
3c527.h
7990.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
7990.h
8139cp.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
8139too.c
8390.c
8390.h
8390p.c
82596.c
a2065.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
a2065.h
ac3200.c
acenic.c
acenic.h
amd8111e.c
amd8111e.h
apne.c
ariadne.c
ariadne.h
at1700.c
atarilance.c
atp.c
atp.h
au1000_eth.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
au1000_eth.h
ax88796.c
b44.c
b44.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
bfin_mac.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
bfin_mac.h
bmac.c	Fix compile error in bmac.c	2009-07-09 20:32:31 -07:00
bmac.h
bnx2.c	bnx2: Fix the behavior of ethtool when ONBOOT=no	2009-06-24 00:19:06 -07:00
bnx2.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2009-06-15 03:02:23 -07:00
bnx2_fw.h
bnx2x.h	bnx2x: Fix the maximal values of coalescing timeouts.	2009-07-05 18:03:23 -07:00
bnx2x_dump.h
bnx2x_fw_defs.h
bnx2x_fw_file_hdr.h
bnx2x_hsi.h
bnx2x_init.h
bnx2x_init_ops.h
bnx2x_link.c
bnx2x_link.h
bnx2x_main.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
bnx2x_reg.h
bsd_comp.c
cassini.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
cassini.h
cnic.c	cnic: Fix __symbol_get() build error.	2009-06-21 11:00:33 -05:00
cnic.h	[SCSI] cnic: Add new Broadcom CNIC driver.	2009-06-09 10:22:42 -05:00
cnic_defs.h	[SCSI] cnic: Add new Broadcom CNIC driver.	2009-06-09 10:22:42 -05:00
cnic_if.h	cnic: Fix __symbol_get() build error.	2009-06-21 11:00:33 -05:00
cpmac.c	cpmac: fix compilation failure introduced with netdev_ops conversion	2009-06-24 18:03:11 -07:00
cs89x0.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
cs89x0.h
davinci_emac.c	davinci_emac: fix kernel oops when changing MAC address while interface is down	2009-07-08 10:46:44 -07:00
de600.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
de600.h
de620.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
de620.h
declance.c	declance: Restore tx descriptor ring locking	2009-06-08 02:42:35 -07:00
defxx.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
defxx.h
depca.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
depca.h
dl2k.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
dl2k.h
dm9000.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
dm9000.h
dnet.c
dnet.h
dummy.c
e100.c	Net / e100: Fix suspend of devices that cannot be power managed	2009-06-18 00:29:10 -07:00
e2100.c
eepro.c
eexpress.c
eexpress.h
enc28j60.c
enc28j60_hw.h
epic100.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
eql.c
es3210.c
eth16i.c
ethoc.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
ewrk3.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ewrk3.h
fealnx.c	fealnx: Fix build breakage -- PR_CONT should be KERN_CONT	2009-07-08 17:35:02 -07:00
fec.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
fec.h	fec: fix definition of 5272 version of FEC_X_DES_ACTIVE register	2009-07-06 18:56:11 -07:00
fec_mpc52xx.c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
fec_mpc52xx.h
fec_mpc52xx_phy.c	Merge commit 'gcl/merge' into next	2009-06-18 11:22:08 +10:00
forcedeth.c	forcedeth: Fix NAPI race.	2009-07-05 18:03:33 -07:00
fsl_pq_mdio.c	fsl_pq_mdio: Fix fsl_pq_mdio to work with modules	2009-06-25 20:03:53 -07:00
fsl_pq_mdio.h
gianfar.c
gianfar.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
gianfar_ethtool.c
gianfar_sysfs.c
hamachi.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
hp-plus.c
hp.c
hp100.c	net: fix network drivers ndo_start_xmit() return values	2009-06-17 04:31:16 -07:00
hp100.h
hplance.c
hplance.h
hydra.c
ibmlana.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
ibmlana.h
ibmveth.c
ibmveth.h
ifb.c
ioc3-eth.c	net: ntohs() misuse	2009-06-11 17:23:24 -07:00
ipg.c
ipg.h	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
isa-skeleton.c
iseries_veth.c
jazzsonic.c
jme.c
jme.h
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-24 10:01:12 -07:00
korina.c
ks8842.c	netdev: Added KS8842 driver	2009-06-08 00:20:20 -07:00
lance.c
lasi_82596.c
lib8390.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
lib82596.c
LICENSE.SRC
ll_temac.h
ll_temac_main.c
ll_temac_mdio.c
lne390.c
loopback.c
lp486e.c
mac89x0.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
mac8390.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-06-03 02:43:41 -07:00
macb.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
macb.h
mace.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
mace.h
macmace.c
macsonic.c
macvlan.c	drivers/net/macvlan.c: fix cloning of tagged VLAN interfaces	2009-06-11 02:32:39 -07:00
Makefile	s6gmac: xtensa s6000 on-chip ethernet driver	2009-06-22 02:37:34 -07:00
mdio.c	mdio add missing GPL flag	2009-06-25 20:06:34 -07:00
meth.c
meth.h
mii.c
mipsnet.c
mv643xx_eth.c	mv643xx_eth: fix unicast filter programming in promiscuous mode	2009-06-19 01:12:52 -07:00
mvme147.c
myri_sbus.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
myri_sbus.h
natsemi.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
ne-h8300.c
ne.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
ne2.c
ne2k-pci.c
ne3210.c
netconsole.c
netx-eth.c
ni52.c
ni52.h
ni65.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ni65.h
ni5010.c
ni5010.h
niu.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
niu.h	trivial: typo (en|dis|avail|remove)bale -> (en|dis|avail|remove)able	2009-06-12 18:01:45 +02:00
ns83820.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
pasemi_mac.c
pasemi_mac.h
pasemi_mac_ethtool.c
pci-skeleton.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
pcnet32.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
plip.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
ppp_async.c	ppp: Fix throttling bugs	2009-06-22 11:32:24 -07:00
ppp_deflate.c
ppp_generic.c
ppp_mppe.c
ppp_mppe.h
ppp_synctty.c	ppp: Fix throttling bugs	2009-06-22 11:32:24 -07:00
pppoe.c
pppol2tp.c	net: skb->dst accessors	2009-06-03 02:51:04 -07:00
pppox.c
ps3_gelic_net.c	net/ps3: gelic - Add missing annotations	2009-06-16 14:15:44 +10:00
ps3_gelic_net.h
ps3_gelic_wireless.c	net/ps3: gelic - Add missing annotations	2009-06-16 14:15:44 +10:00
ps3_gelic_wireless.h
qla3xxx.c	qla3xxx: Don't sleep while holding lock.	2009-06-23 16:36:27 -07:00
qla3xxx.h
r6040.c	r6040: bump driver version to 0.24 and date to 08 July 2009	2009-07-08 10:49:28 -07:00
r8169.c	r8169: remove unused variable	2009-06-19 01:12:52 -07:00
rionet.c
rrunner.c	net: fix network driver ndo_start_xmit() return values (part 1)	2009-06-13 01:18:32 -07:00
rrunner.h
s2io-regs.h
s2io.c	s2io: Remove private boolean definitions	2009-06-08 00:20:22 -07:00
s2io.h	s2io: Remove private boolean definitions	2009-06-08 00:20:22 -07:00
s6gmac.c	s6gmac: xtensa s6000 on-chip ethernet driver	2009-06-22 02:37:34 -07:00
sb1000.c
sb1250-mac.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sc92031.c
seeq8005.c
seeq8005.h
sgiseeq.c
sgiseeq.h
sh_eth.c	sh_eth: remove redundant test on unsigned	2009-06-25 20:03:56 -07:00
sh_eth.h
sis190.c	sis190: use an adequate phy list entry as a fallback	2009-06-17 18:46:46 -07:00
sis900.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sis900.h
skge.c
skge.h
sky2.c	sky2: Fix checksum endianness	2009-06-26 09:28:42 -07:00
sky2.h	sky2: skb recycling	2009-06-17 18:46:54 -07:00
slhc.c
slip.c
slip.h
smc-mca.c
smc-ultra.c
smc-ultra32.c
smc91x.c
smc91x.h	[ARM] pxa/stargate2: Add board specific elements to the smc91x driver	2009-06-05 10:46:25 +08:00
smc911x.c
smc911x.h
smc9194.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
smc9194.h
smsc911x.c	drivers/net/smsc911x.c: Fix resource size off by 1 error	2009-07-05 18:03:30 -07:00
smsc911x.h
smsc9420.c
smsc9420.h
sni_82596.c
sonic.c	sonic: Fix build after ndo_start_xmit() changes.	2009-06-17 01:36:23 -07:00
sonic.h
Space.c
spider_net.c
spider_net.h
spider_net_ethtool.c
starfire.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
stnic.c
sun3_82586.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sun3_82586.h
sun3lance.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sunbmac.c
sunbmac.h
sundance.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
sungem.c
sungem.h
sungem_phy.c
sungem_phy.h
sunhme.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
sunhme.h
sunlance.c
sunqe.c
sunqe.h
sunvnet.c
sunvnet.h
tc35815.c
tehuti.c	tehuti: No need check vfree() pointer.	2009-06-11 02:47:14 -07:00
tehuti.h
tg3.c	net: skb_shared_info optimization	2009-06-08 00:21:48 -07:00
tg3.h
tlan.c	net: use symbolic values for ndo_start_xmit() return codes	2009-06-13 01:18:50 -07:00
tlan.h
tsi108_eth.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
tsi108_eth.h
tun.c	tun/tap: Fix crashes if open() /dev/net/tun and then poll() it.	2009-07-06 12:47:07 -07:00
typhoon.c
typhoon.h
ucc_geth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
ucc_geth.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2009-06-18 14:07:15 -07:00
ucc_geth_ethtool.c	trivial: fix typos s/paramter/parameter/ and s/excute/execute/ in documentation and source comments.	2009-06-12 18:01:46 +02:00
veth.c	Revert "veth: prevent oops caused by netdev destructor"	2009-06-25 02:45:42 -07:00
via-rhine.c
via-velocity.c	via-velocity: Fix velocity driver unmapping incorrect size.	2009-06-21 22:42:30 -07:00
via-velocity.h
virtio_net.c	net: group address list and its count	2009-06-18 00:29:08 -07:00
wd.c
xen-netfront.c	xen: remove driver_data direct access of struct device from more drivers	2009-06-15 21:30:28 -07:00
xtsonic.c
yellowfin.c	Remove multiple KERN_ prefixes from printk formats	2009-07-08 10:30:03 -07:00
znet.c
zorro8390.c