aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* ipw2x00: remove the right /proc/net entryLinus Torvalds2010-11-051-4/+5
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-11-0516-52/+115
|\
| * de2104x: fix panic on loadEric Dumazet2010-11-031-1/+0
| * atl1 : fix panic on loadEric Dumazet2010-11-031-1/+0
| * netxen: remove unused firmware exportsAmerigo Wang2010-11-031-3/+0
| * caif: SPI-driver bugfix - incorrect padding.Sjur Brændeland2010-11-032-19/+51
| * smsc911x: Set Ethernet EEPROM size to supported device's sizeJohn Faith2010-11-031-1/+1
| * cxgb4vf: remove call to stop TX queues at load time.Divy Le Ray2010-11-011-1/+0
| * cxgb4: remove call to stop TX queues at load time.Divy Le Ray2010-11-011-1/+0
| * cxgb3: remove call to stop TX queues at load time.Divy Le Ray2010-11-011-1/+0
| * ibm_newemac: Remove netif_stop_queue() in emac_probe().David S. Miller2010-11-011-1/+0
| * usbnet: fix usb_autopm_get_interface failure(v1)Ming Lei2010-11-011-0/+11
| * bnx2x: Update version numberYaniv Rosner2010-11-011-2/+2
| * bnx2x: Reset 8073 phy during common initYaniv Rosner2010-11-011-0/+1
| * bnx2x: Do not enable CL37 BAM unless it is explicitly enabledYaniv Rosner2010-11-012-7/+20
| * bnx2x: Fix resetting BCM8726 PHY during common initYaniv Rosner2010-11-011-1/+1
| * bnx2x: Clear latch indication on link resetYaniv Rosner2010-11-011-1/+10
| * bnx2x: Fix port selection in case of E2Yaniv Rosner2010-11-011-3/+12
| * bnx2x: Fix waiting for reset complete on BCM848x3 PHYsYaniv Rosner2010-11-011-3/+5
| * bnx2x: Restore appropriate delay during BMAC resetYaniv Rosner2010-11-011-1/+1
| * qlcnic: fix panic on loadEric Dumazet2010-10-311-1/+0
| * jme: fix panic on loadEric Dumazet2010-10-311-4/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-10-307-21/+21
|\ \ | |/
| * netdev: can: Change mail address of Hans J. KochHans J. Koch2010-10-301-1/+1
| * pcnet_cs: add new_idKen Kawasaki2010-10-301-0/+1
| * can: pch_can: fix section mismatch warning by using a whitelisted nameMarc Kleine-Budde2010-10-301-3/+3
| * can: pch_can: fix sparse warningMarc Kleine-Budde2010-10-301-2/+2
| * netxen_nic: Fix the tx queue manipulation bug in netxen_nic_probeDenis Kirjanov2010-10-301-1/+0
| * vmxnet: trivial annotation of protocol constantHarvey Harrison2010-10-301-1/+1
| * vmxnet3: remove unnecessary byteswapping in BAR writing macrosHarvey Harrison2010-10-301-4/+4
| * phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addrCyril Chemparathy2010-10-291-9/+9
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-10-2928-101/+244
|\ \ | |/
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-10-299-35/+94
| |\
| | * b43: Fix warning at drivers/mmc/core/core.c:237 in mmc_wait_for_cmdLarry Finger2010-10-291-0/+2
| | * libertas: Fix sd8686 firmware reloadPaul Fox2010-10-291-3/+29
| | * ath9k: Fix incorrect access of rate flags in RCMohammed Shafi Shajakhan2010-10-291-1/+1
| | * ath5k: Fix double free on hw attach error pathJones Desougi2010-10-271-9/+8
| | * ath9k_htc: Set proper firmware offset for Netgear WNDA3200Rajkumar Manoharan2010-10-271-2/+8
| | * ath9k: fix tx aggregation flush on AR9003Felix Fietkau2010-10-271-9/+9
| | * ath9k: lock reset and PCU start/stoppingLuis R. Rodriguez2010-10-272-2/+27
| | * ath9k: rename rxflushlock to pcu_lockLuis R. Rodriguez2010-10-273-6/+6
| | * ath9k: add locking for starting the PCU on RXLuis R. Rodriguez2010-10-271-3/+4
| | * ath9k: add locking for stopping RXLuis R. Rodriguez2010-10-271-2/+2
| * | stmmac: enable/disable rx/tx in the core with a single write.avisconti2010-10-281-30/+10
| * | net: atarilance - flags should be unsigned longGeert Uytterhoeven2010-10-281-1/+1
| * | netxen: fix kdumpRajesh Borundia2010-10-282-15/+7
| * | cxgb3: Fix panic in free_tx_desc()Krishna Kumar2010-10-281-1/+3
| * | cxgb3: fix crash due to manipulating queues before registrationNishanth Aravamudan2010-10-281-1/+1
| * | 8390: Don't oops on starting dev queuePavel Emelyanov2010-10-281-1/+0
| * | igbvf: fix panic on loadEmil Tantilov2010-10-281-4/+4