summaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/...David S. Miller2011-03-081-9/+0Star
|\
| * r8169: convert to new VLAN model.Francois Romieu2011-03-051-9/+0Star
* | net: add Faraday FTMAC100 10/100 Ethernet driverPo-Yu Chuang2011-03-031-0/+9
* | cxgb{3,4}*: improve Kconfig dependenciesDimitris Michailidis2011-03-031-18/+3Star
|/
* ax88796: use generic mdio_bitbang driverMarc Kleine-Budde2011-02-211-2/+2
* net/fec: consolidate all i.MX options to CONFIG_ARMUwe Kleine-König2011-02-151-1/+2
* kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-211-1/+1
* net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FSNicholas Bellinger2011-01-161-2/+1Star
* Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2011-01-121-0/+1
|\
| * xen/netfront: select XEN_XENBUS_FRONTENDJeremy Fitzhardinge2011-01-051-0/+1
* | net/fec: remove config FEC2 as it's used nowhereShawn Guo2011-01-111-8/+0Star
* | net/fec: add dual fec support for mx28Shawn Guo2011-01-101-3/+4
* | r8169: remove the firmware of RTL8111D.françois romieu2011-01-041-0/+1
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-12-271-0/+12
|\|
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-11-291-3/+3
| |\
| * | drivers/net/tile/: on-chip network drivers for the tile architectureChris Metcalf2010-11-241-0/+12
* | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-12-081-3/+3
|\ \ \ | | |/ | |/|
| * | pch_gbe dreiver: chang authorToshiharu Okada2010-11-291-3/+3
| |/
* | net: more Kconfig whitespace cleanupPhilippe De Muyter2010-11-171-6/+6
* | net: Kconfig whitespace cleanupPhilippe De Muyter2010-11-121-112/+112
* | vxge: update KconfigJon Mason2010-11-111-5/+14
|/
* 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-261-8/+0Star
|\ \
| * | netdev: bfin_mac: push settings to platform resourcesSonic Zhang2010-10-251-8/+0Star
| |/
* | 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/+10Star
|\ \ \
| * | | Update broken web addresses in the kernel.Justin P. Mattock2010-10-181-11/+10Star
* | | | 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-251-0/+12
| * | | | bna: Brocade 10Gb Ethernet device driverRasesh Mody2010-08-241-0/+14
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-08-221-0/+10
| |\ \ \ \
| * | | | | PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)Dmitry Kozlov2010-08-221-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-041-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-241-0/+10
|\ \ \ | |/ / |/| / | |/
| * net: add Fast Ethernet driver for PXA168.Sachin Sanap2010-08-191-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-311-1/+1