summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-08-0619-497/+311
|\
| * pcmcia: do not request windows if you don't need toDominik Brodowski2010-08-031-36/+1
| * pcmcia: use struct resource for PCMCIA devices, part 2Dominik Brodowski2010-08-033-11/+1
| * pcmcia: remove memreq_tDominik Brodowski2010-08-038-54/+19
| * pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski2010-08-0319-205/+195
| * pcmcia: do not use io_req_t after call to pcmcia_request_io()Dominik Brodowski2010-08-0317-53/+50
| * pcmcia: use pcmica_{read,write}_config_byteDominik Brodowski2010-08-035-114/+49
| * pcmcia: remove cs_types.hDominik Brodowski2010-07-3019-31/+3
* | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2010-08-062-24/+8
|\ \
| * | PCI: change device runtime PM settings for probe and removeAlan Stern2010-07-302-24/+8
* | | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-0510-33/+31
|\ \ \
| * | | of/address: Clean up function declarationsGrant Likely2010-08-012-1/+2
| * | | of/platform: remove all of_bus_type and of_platform_bus_type referencesGrant Likely2010-07-247-15/+15
| * | | Merge commit 'v2.6.35-rc6' into devicetree/nextGrant Likely2010-07-2459-241/+414
| |\ \ \ | | | |/ | | |/|
| * | | niu: always include of_device.hRandy Dunlap2010-07-051-3/+0
| * | | of: kill struct of_deviceGrant Likely2010-06-281-2/+2
| * | | sparc/of: Move of_device fields into struct pdev_archdataGrant Likely2010-06-286-12/+12
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-08-052-38/+1
|\ \ \ \
| * \ \ \ Merge commit 'gcl/next' into nextBenjamin Herrenschmidt2010-08-047-12/+31
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Remove REDWOOD_[456] config options and conditional codeChristian Dietrich2010-07-262-38/+1
* | | | | 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
OpenPOWER on IntegriCloud