summaryrefslogtreecommitdiff
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv...Jeff Garzik2006-03-018-102/+81
|\
| * [PATCH] wireless/airo: Remove 'Setting transmit key' info messagesDan Williams2006-02-271-2/+0
| * Merge branch 'from-jgarzik-upstream'John W. Linville2006-02-271-48/+545
| |\
| * \ Merge branch 'from-linus'John W. Linville2006-02-2717-197/+513
| |\ \
| * | | [PATCH] wireless/airo: fix setting TX key index plus key in ENCODEEXTDan Williams2006-02-171-3/+8
| * | | [PATCH] ipw2200: Fix software crypto shared WEP authentication problemZhu Yi2006-02-171-2/+1
| * | | [PATCH] trivial: fix spelling errors in KconfigsJon Mason2006-02-175-17/+17
| * | | [PATCH] ipw2200: Fix WPA network selection problemStefan Rompf2006-02-171-2/+2
| * | | [PATCH] ipw2200: add monitor and qos entries to KconfigAndreas Happe2006-02-171-0/+13
| * | | [PATCH] wireless/atmel: convert constants to ieee80211 layer equivalentsDan Williams2006-02-171-74/+36
| * | | [PATCH] let IPW2{1,2}00 select IEEE80211Jan Niehusmann2006-02-171-2/+4
| * | | Merge branch 'upstream-fixes'John W. Linville2006-02-171-39/+59
| |\ \ \
| * \ \ \ Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgar...John W. Linville2006-02-1773-2208/+1548
| |\ \ \ \
* | \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2006-03-017-170/+79
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch 'e1000' of ssh://198.78.49.142/srv/git/intel/linux-2.6Jeff Garzik2006-03-012-76/+46
| |\ \ \ \ \
| | * | | | | [PATCH] e1000: revert to single descriptor for legacy receive pathJeff Kirsher2006-02-282-76/+46
| * | | | | | [PATCH] sky2: remove MSI supportStephen Hemminger2006-02-282-78/+0
| * | | | | | Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux...Jeff Garzik2006-02-282-16/+24
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | 8139cp: fix broken suspend/resumeFrancois Romieu2006-02-271-16/+21
| | * | | | | via-velocity: fix memory corruption when changing the mtuFrancois Romieu2006-02-271-0/+3
| * | | | | | [TG3]: Fix Sun tg3 variant detection.David S. Miller2006-02-271-0/+9
| |/ / / / /
* | | | | | Merge branch 'master'Jeff Garzik2006-02-273-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix Wake on LAN support in sis900Daniele Venzano2006-02-251-2/+2
| * | | | | Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-02-236-153/+370
| |\ \ \ \ \
| | * | | | | [PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific codeAdrian Bunk2006-02-241-0/+2
| * | | | | | [NET]: Increase default IFB device count.Richard Lucassen2006-02-231-1/+1
* | | | | | | Merge branch 'upstream-fixes'Jeff Garzik2006-02-238-174/+450
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | skge: protect interrupt maskStephen Hemminger2006-02-232-7/+15
| * | | | | | skge: genesis phy initialzationStephen Hemminger2006-02-231-11/+26
| * | | | | | skge: NAPI/irq race fixStephen Hemminger2006-02-231-12/+5
| * | | | | | r8169: enable wake on lanFrancois Romieu2006-02-231-0/+87
| * | | | | | r8169: fix broken ring index handling in suspend/resumeFrancois Romieu2006-02-231-43/+59
| * | | | | | [PATCH] sky2: close race on IRQ mask update.Stephen Hemminger2006-02-232-7/+17
| * | | | | | [PATCH] sky2: use device iomem to access PCI configStephen Hemminger2006-02-232-48/+54
| * | | | | | [PATCH] sky2: force early transmit statusStephen Hemminger2006-02-231-8/+6
| * | | | | | [PATCH] sky2: poke coalescing timer to fix hangStephen Hemminger2006-02-231-0/+11
| * | | | | | [PATCH] sky2: limit coalescing values to ring sizeStephen Hemminger2006-02-231-3/+3
| * | | | | | [PATCH] sky2: yukon-ec-u chipset initializationStephen Hemminger2006-02-232-19/+90
| |/ / / / /
| * | | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-02-202-18/+79
| |\ \ \ \ \
| | * | | | | [IRDA]: irda-usb bug fixesJean Tourrilhes2006-02-192-18/+79
| | |/ / / /
| * | | | | [PATCH] ipw2200: Suppress warning messageZhu Yi2006-02-201-3/+3
| |/ / / /
* | | | | Merge branch 'forcedeth'Jeff Garzik2006-02-201-48/+545
|\ \ \ \ \
| * | | | | [PATCH] forcedeth: Add support for MSI/MSIXAyaz Abdulla2006-02-201-31/+436
| * | | | | [PATCH] forcedeth: Add support for 64bit ringsAyaz Abdulla2006-02-201-16/+42
| * | | | | [PATCH] forcedeth: Add vlan supportAyaz Abdulla2006-02-201-5/+71
| |/ / / /
* | | | | Merge branch 'upstream-fixes'Jeff Garzik2006-02-1711-61/+111
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | [PATCH] bonding: fix a locking bug in bond_releaseJay Vosburgh2006-02-171-0/+1
| * | | [PATCH] smctr warning fixAndrew Morton2006-02-171-1/+1
| * | | [PATCH] sky2: speed setting fixStephen Hemminger2006-02-171-1/+30
| * | | [PATCH] skge: speed settingStephen Hemminger2006-02-171-1/+9