aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-11-291-3/+3
|\
| * pch_gbe dreiver: chang authorToshiharu Okada2010-11-291-3/+3
* | drivers/net/tile/: on-chip network drivers for the tile architectureChris Metcalf2010-11-241-0/+12
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-10-291-0/+1
|\
| * pch_gbe: Select MII.David S. Miller2010-10-281-0/+1
* | MN10300: ASB2364: Add support for SMSC911X and SMC911XAkira Takeuchi2010-10-271-2/+10
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vap...Linus Torvalds2010-10-251-8/+0
|\ \
| * | netdev: bfin_mac: push settings to platform resourcesSonic Zhang2010-10-251-8/+0
| |/
* | Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2010-10-251-0/+21
|\ \ | |/ |/|
| * Merge branch 'davinci-next' into davinci-for-linusKevin Hilman2010-10-211-0/+21
| |\
| | * net: davinci_emac: separate out cpdma codeCyril Chemparathy2010-09-241-0/+10
| | * net: davinci_emac: switch to new mdioCyril Chemparathy2010-09-241-0/+1
| | * net: davinci_emac: separate out davinci mdioCyril Chemparathy2010-09-241-0/+10
* | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Linus Torvalds2010-10-241-11/+10
|\ \ \
| * | | Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-11/+10
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-231-7/+44
|\ \ \ \ | |_|/ / |/| | |
| * | | net: move MII outside of NET_ETHERNET, fix kconfig warningRandy Dunlap2010-10-161-7/+7
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-10-041-2/+2
| |\ \ \
| * | | | net: Add Gigabit Ethernet driver of Topcliff PCHMasayuki Ohtake2010-09-241-0/+12
| * | | | bna: Brocade 10Gb Ethernet device driverRasesh Mody2010-08-231-0/+14
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-08-211-0/+10
| |\ \ \ \
| * | | | | PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)Dmitry Kozlov2010-08-211-0/+11
| | |_|/ / | |/| | |
* | | | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene...Russell King2010-10-191-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | netdev: Depend on INET before selecting INET_LROBen Hutchings2010-10-031-2/+2
| | |_|/ | |/| |
* / | | net: atmel_macb Kconfig: remove long dependency lineJean-Christophe PLAGNIOL-VILLARD2010-10-071-1/+4
|/ / /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-231-0/+10
|\ \ \ | |/ / |/| / | |/
| * net: add Fast Ethernet driver for PXA168.Sachin Sanap2010-08-181-0/+10
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-08-051-1/+1
|\ \
| * | Remove REDWOOD_[456] config options and conditional codeChristian Dietrich2010-07-261-1/+1
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2010-08-051-1/+1
|\ \ \ | |_|/ |/| |
| * | MIPS: Alchemy: remove SOC_AU1X00 in favor of MIPS_ALCHEMYManuel Lauss2010-08-051-1/+1
| |/
* | net: ks8842 depends on DMA_ENGINERandy Dunlap2010-07-301-1/+1
* | net: Removing dead ARCH_PNX010XChristoph Egger2010-07-191-2/+2
* | drivers/net: Add Micrel KS8841/42 support to ks8842 driverDavid J. Choi2010-07-131-3/+4
* | net: sh_eth: add support for SH7757's ETHERYoshihiro Shimoda2010-07-071-2/+3
* | cxgb4vf: Stitch new T4 PCI-E SR-IOV Virtual Function driver into the buildCasey Leedom2010-06-281-0/+23
* | enic: Feature Add: Replace LRO with GROVasanthy Kolluri2010-06-251-1/+0
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-231-0/+2
|\|
| * net: add dependency on fw class module to qlcnic and netxen_nicAnirban Chakraborty2010-06-231-0/+2
* | r6040: implement phylibFlorian Fainelli2010-06-011-0/+1
|/
* netdev: bfin_mac: add support for IEEE 1588 PTPBarry Song2010-05-171-0/+7
* forcedeth: Kill NAPI config options.David S. Miller2010-05-031-14/+0
* Add non-Virtex5 support for LL TEMAC driverJohn Linn2010-04-131-1/+1
* Revert "Add non-Virtex5 support for LL TEMAC driver"David S. Miller2010-04-071-1/+1
* au1000-eth: allow driver to be compiled as a moduleFlorian Fainelli2010-04-071-1/+1
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-04-061-0/+25
|\
| * net: Hook up cxgb4 to Kconfig and MakefileDimitris Michailidis2010-04-011-0/+25
* | Add non-Virtex5 support for LL TEMAC driverJohn Linn2010-04-061-1/+1
* | l2tp: Split pppol2tp patch into separate l2tp and ppp partsJames Chapman2010-04-031-6/+1
* | netdev/fec.c: add phylib supporting to enable carrier detection (v2)Bryan Wu2010-04-011-0/+1