summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-08-052-25/+8
|\
| * MIPS: au1000_eth: Get ethernet address from platform_dataManuel Lauss2010-08-051-24/+7
| * MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMYManuel Lauss2010-08-051-1/+1
* | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-08-0413-23/+23
|\ \
| * \ Merge branch 'master' into for-nextJiri Kosina2010-08-0470-287/+529
| |\ \
| * | | hostap:hostap_hw.c Fix typo in commentJustin P. Mattock2010-08-041-1/+1
| * | | Fix spelling contorller -> controller in commentsStefan Weil2010-08-041-1/+1
| * | | fix comment typos concerning "challenge"Uwe Kleine-König2010-07-191-1/+1
| * | | Merge branch 'master' into for-nextJiri Kosina2010-06-16118-809/+3135
| |\ \ \
| * | | | fix typos concerning "initiali[zs]e"Uwe Kleine-König2010-06-168-18/+18
| * | | | fix typos concerning "management"Uwe Kleine-König2010-06-161-1/+1
| * | | | fix typos concerning "first"Uwe Kleine-König2010-06-161-1/+1
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-08-04640-36701/+54648
|\ \ \ \ \
| * | | | | phy/marvell: add 88ec048 supportCyril Chemparathy2010-08-031-0/+42
| * | | | | igb: Program MDICNFG register prior to PHY initAlexander Duyck2010-08-031-7/+11
| * | | | | e1000e: correct MAC-PHY interconnect register offset for 82579Bruce Allan2010-08-031-1/+1
| * | | | | hso: Add new product IDFilip Aben2010-08-031-0/+1
| * | | | | can: Add driver for esd CAN-USB/2 deviceMatthias Fuchs2010-08-033-0/+1139
| * | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-08-021-1/+1
| |\ \ \ \ \
| | * | | | | e1000e: 82577/82578 PHY register access issuesBruce Allan2010-07-271-1/+1
| * | | | | | phy/marvell: add 88e1121 interface mode supportCyril Chemparathy2010-08-021-3/+32
| * | | | | | net: Fix a typo from "dev" to "ndev"Henrique Camargo2010-08-021-2/+2
| * | | | | | igb: Use irq_synchronize per vector when using MSI-XEmil Tantilov2010-08-021-1/+7
| * | | | | | ixgbevf: fix null pointer dereference due to filter being set for VLAN 0Alexander Duyck2010-08-021-11/+1
| * | | | | | e1000e: Fix irq_synchronize in MSI-X caseJeff Kirsher2010-08-022-8/+19
| * | | | | | e1000e: register pm_qos request on hardware activationFlorian Mickler2010-08-021-12/+11
| * | | | | | cxgb4: update driver versionDimitris Michailidis2010-08-021-1/+1
| * | | | | | cxgb4: add new PCI IDsDimitris Michailidis2010-08-021-0/+10
| * | | | | | cxgb4: fix wrong shift directionDimitris Michailidis2010-08-021-1/+1
| * | | | | | cxgb4: support running the driver on PCI functions besides 0Dimitris Michailidis2010-08-023-72/+97
| * | | | | | cxgb4: advertise NETIF_F_TSO_ECNDimitris Michailidis2010-08-021-4/+6
| * | | | | | cxgb4: get on-chip queue info from FW and create a memory window for themDimitris Michailidis2010-08-024-2/+29
| * | | | | | cxgb4: fix TSO descriptorsDimitris Michailidis2010-08-021-11/+11
| * | | | | | cxgb4: don't offload Rx checksums for IPv6 fragmentsDimitris Michailidis2010-08-022-3/+6
| * | | | | | cxgb4: disable an interrupt that is neither used nor servicedDimitris Michailidis2010-08-021-1/+1
| * | | | | | hp100: unmap memory on error pathDan Carpenter2010-08-021-2/+4
| * | | | | | Tulip: don't initialize SBE xT3E3 WAN ports.Krzysztof Hałasa2010-08-021-0/+6
| * | | | | | drivers/net/wan/farsync.c: Use standard pr_<level>Joe Perches2010-08-021-58/+53
| * | | | | | tg3: Update version to 3.113Matt Carlson2010-08-021-2/+2
| * | | | | | tg3: Migrate tg3_flags to phy_flagsMatt Carlson2010-08-022-152/+159
| * | | | | | tg3: Create phy_flags and migrate phy_is_low_powerMatt Carlson2010-08-022-19/+20
| * | | | | | tg3: Add phy-related preprocessor constantsMatt Carlson2010-08-022-23/+27
| * | | | | | tg3: Add error reporting to tg3_phydsp_write()Matt Carlson2010-08-021-31/+20
| * | | | | | tg3: Improve small packet performanceMatt Carlson2010-08-021-1/+23
| * | | | | | tg3: Remove 5720, 5750, and 5750MMatt Carlson2010-08-021-3/+0
| * | | | | | tg3: Detect APE firmware typesMatt Carlson2010-08-022-1/+10
| * | | | | | tg3: Restrict ASPM workaround devlistMatt Carlson2010-08-021-1/+3
| * | | | | | tg3: Manage gphy power for CPMU-less devs onlyMatt Carlson2010-08-021-1/+4
| * | | | | | tg3: Don't access phy test ctrl reg for 5717+Matt Carlson2010-08-022-3/+11
| * | | | | | tg3: Create TG3_FLG3_5717_PLUS flagMatt Carlson2010-08-022-50/+23