summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge'Paul Mackerras2006-08-0153-1316/+3325
|\
| * Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux...Jeff Garzik2006-07-291-4/+13
| |\
| | * via-velocity: fix speed and link status reported by ethtoolJay Cliburn2006-07-201-4/+13
| * | [PATCH] skge: chip clock rate typoStephen Hemminger2006-07-291-4/+1
| * | [PATCH] myri10ge - Always do a dummy RDMA after loading the firmwareBrice Goglin2006-07-291-1/+1
| * | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Jeff Garzik2006-07-294-3/+6
| |\ \
| | * | [PATCH] orinoco: fix setting transmit key onlyDan Williams2006-07-271-2/+2
| | * | [PATCH] softmac: do shared key auth in workqueueDaniel Drake2006-07-271-1/+1
| | * | [PATCH] airo: should select crypto_aesRobert Schulze2006-07-271-0/+1
| | * | [PATCH] zd1201: workaround interference problemPavel Machek2006-07-271-0/+2
| * | | [SUNLANCE]: fix compilation on sparc-UPAlexey Dobriyan2006-07-281-4/+4
| |/ /
| * | [TG3]: Update version and reldateMichael Chan2006-07-251-2/+2
| * | [TG3]: Handle tg3_init_rings() failuresMichael Chan2006-07-251-5/+27
| * | [TG3]: Add tg3_restart_hw()Michael Chan2006-07-251-22/+58
| * | [DUMMY]: Avoid an oops when dummy_init_one() failedNicolas Dichtel2006-07-211-0/+1
| * | [IFB] After ifb_init_one() failed, i is increased. DecreaseNicolas Dichtel2006-07-211-0/+1
| * | [NET]: sun happymeal, little pci cleanupJiri Slaby2006-07-211-7/+2
| * | [WAN]: Cosmetic changes to N2 and C101 driversKrzysztof Halasa2006-07-212-3/+4
| * | [WAN]: Added missing netif_dormant_off() to generic HDLCKrzysztof Halasa2006-07-214-0/+4
| * | [PATCH] spidernet: rework tx queue handlingJens Osterkamp2006-07-172-377/+274
| * | [PATCH] spidernet: bug fix for init codeJens Osterkamp2006-07-171-1/+1
| * | [PATCH] sky2: NAPI poll fixStephen Hemminger2006-07-171-5/+2
| * | Merge branch 'upstream-fixes-jgarzik' of git://lost.foo-projects.org/~ahkok/g...Jeff Garzik2006-07-172-26/+29
| |\ \ | | |/ | |/|
| | * e1000: bump version to 7.1.9-k4Auke Kok2006-07-141-1/+1
| | * e1000: fix panic on large frame receive when mtu=defaultAuke Kok2006-07-142-2/+4
| | * e1000: remove CRC bytes from measured packet lengthAuke Kok2006-07-141-1/+9
| | * e1000: Redo netpoll fix to address community concernsAuke Kok2006-07-141-22/+15
| * | Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEADLinus Torvalds2006-07-126-68/+82
| |\ \ | | |/ | |/|
| | * [WAN]: converting generic HDLC to use netif_dormant*()Krzysztof Halasa2006-07-126-68/+82
| * | [PATCH] sky2: optimize receive restartStephen Hemminger2006-07-121-5/+22
| * | [PATCH] sky2: PHY power on delaysStephen Hemminger2006-07-121-1/+2
| * | [PATCH] sky2: NAPI suspend/resume of dual port cardsStephen Hemminger2006-07-121-7/+4
| * | [PATCH] sky2: sky2_reset section mismatchStephen Hemminger2006-07-121-1/+1
| * | [PATCH] sk98lin: fix truncated collision threshold maskStephen Hemminger2006-07-121-1/+1
| * | [PATCH] skge: fix truncated collision threshold maskStephen Hemminger2006-07-121-2/+2
| * | [PATCH] sky2: fix truncated collision threshold maskStephen Hemminger2006-07-121-1/+1
| * | [PATCH] myri10ge return value fixBrice Goglin2006-07-121-3/+10
| * | [PATCH] Update smc91x driver with ARM Versatile board infoDeepak Saxena2006-07-121-0/+18
| * | [PATCH] ixgb: fix tx unit hang - properly calculate desciptor countAuke Kok2006-07-121-2/+2
| * | [PATCH] smsc-ircc2: fix section reference mismatchesDmitry Torokhov2006-07-121-1/+1
| * | [PATCH] 8139cp.c printk fixAndrew Morton2006-07-121-1/+1
| * | [PATCH] s2io driver irq fixAnanda Raju2006-07-122-145/+145
| * | [PATCH] e1000: irq naming updateAndrew Morton2006-07-121-1/+1
| * | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Jeff Garzik2006-07-122-10/+4
| |\ \
| | * | [PATCH] zd1211rw: usb_clear_halt not allowed in IRQ contextDaniel Drake2006-07-101-9/+3
| | * | [PATCH] bcm43xx-softmac: Fix an off-by-one condition in handle_irq_noiseLarry Finger2006-07-101-1/+1
| * | | [PATCH] forcedeth: watermark fixupAyaz Abdulla2006-07-121-4/+19
| * | | [PATCH] forcedeth: deferral fixupAyaz Abdulla2006-07-121-7/+19
| | |/ | |/|
| * | [BPQ] lockdep: fix false positiveRalf Baechle2006-07-101-0/+7
| * | [PATCH] release_firmware() fixesMagnus Damm2006-07-101-21/+16