summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master'Jeff Garzik2006-02-072-7/+2
|\
| * [PATCH] Kbuild menu - hide empty NETDEVICES menu when NET is disabledPaolo 'Blaisorblade' Giarrusso2006-02-071-6/+1
| * [PATCH] uli526x warning fixAndrew Morton2006-02-071-1/+1
* | Merge branch 'upstream-fixes'Jeff Garzik2006-02-0713-109/+220
|\|
| * Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux...Jeff Garzik2006-02-072-18/+33
| |\
| | * 8139too: fix a TX timeout watchdog thread against NAPI softirq raceFrancois Romieu2006-02-011-12/+26
| | * dscc4: fix dscc4_init_dummy_skb checkAlexey Dobriyan2006-02-011-1/+1
| | * r8169: fix forced-mode link settingsAndy Gospodarek2006-01-311-0/+3
| | * r8169: prevent excessive busy-waitingFrancois Romieu2006-01-291-6/+4
| * | [PATCH] gianfar: Fix sparse warningsKumar Gala2006-02-074-30/+27
| * | [PATCH] dscc4: fix dscc4_init_dummy_skb checkAlexey Dobriyan2006-02-071-1/+1
| * | [PATCH] bonding: Sparse warnings fixLuiz Fernando Capitulino2006-02-071-3/+3
| * | [PATCH] bonding: allow bond to use TSO if slaves support itJay Vosburgh2006-02-071-1/+14
| * | [PATCH] sky2: version 0.15 updateStephen Hemminger2006-02-071-6/+1
| * | [PATCH] sky2: support msi interrupt (revised)Stephen Hemminger2006-02-072-0/+78
| * | [PATCH] sky2: add irq to entropy poolStephen Hemminger2006-02-071-1/+2
| * | [PATCH] sky2: clear irq raceStephen Hemminger2006-02-071-3/+3
| * | [PATCH] sky2: set mac address fixStephen Hemminger2006-02-071-5/+10
| * | [PATCH] sky2: ethtool rx_coalesce settings fixStephen Hemminger2006-02-071-1/+1
| * | [PATCH] sky2: pci config space checkingStephen Hemminger2006-02-072-17/+22
| * | [PATCH] sky2: power management fixStephen Hemminger2006-02-071-20/+25
| * | [PATCH] sis900: remove cfgpmcsr I/O space register defineLennert Buytenhek2006-02-071-1/+0
| * | e100: remove init_hw call to fix panicJesse Brandeburg2006-02-071-2/+0
* | | Merge branch 'sundance'Jeff Garzik2006-02-071-1/+5
|\ \ \
| * | | sundance: Really read addr 0Arnaldo Carvalho de Melo2006-01-261-1/+5
| | |/ | |/|
* | | Merge branch 'master'Jeff Garzik2006-02-079-541/+697
|\ \ \ | | |/ | |/|
| * | [PPP]: Fixed hardware RX checksum handlingHerbert Xu2006-02-051-0/+3
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-02-032-4/+27
| |\ \
| | * | [TG3]: Update driver version and release date.David S. Miller2006-02-021-2/+2
| | * | [TG3]: Flush tg3_reset_task()Michael Chan2006-02-022-2/+25
| * | | [PATCH] 3c59x: collision statistic fixSteffen Klassert2006-02-031-10/+23
| |/ /
| * | [PATCH] ipw2200: fix ->eeprom[EEPROM_VERSION] checkAlexey Dobriyan2006-02-011-1/+1
| * | [PATCH] lp486e: remove SLOW_DOWN_IOAlexey Dobriyan2006-02-011-2/+0
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6Linus Torvalds2006-01-313-524/+643
| |\ \
| | * | [BNX2]: Update version and copyright yearMichael Chan2006-01-233-8/+7
| | * | [BNX2]: Add PHY loopback testMichael Chan2006-01-231-22/+79
| | * | [BNX2]: Use netdev_priv()Michael Chan2006-01-231-40/+40
| | * | [BNX2]: Fix nvram sizingMichael Chan2006-01-232-3/+14
| | * | [BNX2]: Workaround hw interrupt bugMichael Chan2006-01-231-2/+17
| | * | [BNX2]: Fix UDP checksum verificationMichael Chan2006-01-233-418/+439
| | * | [BNX2]: Misc. fixesMichael Chan2006-01-232-6/+15
| | * | [BNX2]: Improve handshake with firmwareMichael Chan2006-01-232-23/+25
| | * | [BNX2]: Fix VLAN on ASFMichael Chan2006-01-232-3/+8
| | |/
| * | [SUNGEM]: Unbreak Sun GEM chips.David S. Miller2006-01-311-30/+25
| * | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-01-3110-96/+115
| |\ \
| * | | [SUNGEM]: Make PM of PHYs more reliable (#2)Benjamin Herrenschmidt2006-01-231-25/+30
| | |/ | |/|
* | | Merge branch 'upstream-fixes'Jeff Garzik2006-01-311-3/+25
|\ \ \ | | |/ | |/|
| * | [PATCH] Clarify help text of SKGE/SK98LIN/SKY2Daniel Drake2006-01-311-3/+25
* | | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Jeff Garzik2006-01-319-537/+812
|\ \ \
| * | | [PATCH] wireless/ipw2200: support WE-18 WPA enc_capaDan Williams2006-01-301-1/+4