summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-11-079-163/+172
|\
| * forcedeth: fix a few sparse warnings (variable shadowing)david decotigny2011-11-071-17/+17
| * forcedeth: Improve stats countersMandeep Baines2011-11-071-0/+4
| * forcedeth: remove unneeded stats updatesdavid decotigny2011-11-071-34/+1Star
| * forcedeth: Acknowledge only interrupts that are being processedMike Ditto2011-11-071-5/+8
| * forcedeth: fix race when unloading moduledavid decotigny2011-11-071-1/+1
| * ixgbe: Fix compile for kernel without CONFIG_PCI_IOV definedRose, Gregory V2011-11-072-2/+4
| * sky2: fix regression on Yukon Optimastephen hemminger2011-11-041-11/+0Star
| * i825xx:xscale:8390:freescale: Fix Kconfig dependanciesJeff Kirsher2011-11-043-4/+10
| * tg3: Update version to 3.121Matt Carlson2011-11-041-2/+2
| * tg3: Eliminate timer race with reset_taskMatt Carlson2011-11-042-13/+2Star
| * tg3: Schedule at most one tg3_reset_task runMatt Carlson2011-11-042-9/+25
| * tg3: Obtain PCI function number from deviceMatt Carlson2011-11-042-6/+33
| * tg3: Fix irq alloc error cleanup pathMatt Carlson2011-11-041-5/+4Star
| * tg3: Fix 4k skb error recovery pathMatt Carlson2011-11-041-8/+8
| * tg3: Fix 4k tx bd segmentation codeMatt Carlson2011-11-041-23/+24
| * tg3: Fix APE mutex init and useMatt Carlson2011-11-042-24/+30
* | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-0730-4/+32
|\ \
| * | drivers/net: fix mislocated headers in cxgb4/l2t.cPaul Gortmaker2011-11-011-4/+3Star
| * | drivers/net: Add moduleparam.h to drivers as required.Paul Gortmaker2011-11-012-0/+2
| * | drivers/net: Add export.h to files using EXPORT_SYMBOL/THIS_MODULEPaul Gortmaker2011-11-0114-0/+14
| * | drivers/net: Add module.h to drivers who were implicitly using itPaul Gortmaker2011-11-0113-0/+13
* | | Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2011-11-071-9/+0Star
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2011-11-072-0/+9
| |/ |/|
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-11-0425-105/+157
|\ \
| * | be2net: Add detect UE feature for LancerPadmanabh Ratnakar2011-11-043-21/+42
| * | be2net: Prevent CQ full condition for LancerPadmanabh Ratnakar2011-11-041-4/+4
| * | be2net: Fix disabling multicast promiscous modePadmanabh Ratnakar2011-11-041-0/+7
| * | be2net: Fix endian issue in RX filter commandPadmanabh Ratnakar2011-11-041-1/+1
| * | ixgbevf: Update release versionGreg Rose2011-11-031-1/+1
| * | ixgbe: DCB, return max for IEEE traffic classesJohn Fastabend2011-11-031-4/+6
| * | ixgbe: fix reading of the buffer returned by the firmwareEmil Tantilov2011-11-031-9/+11
| * | ixgbe: Fix compiler warningsGreg Rose2011-11-031-0/+2
| * | ixgbe: fix smatch splat due to missing NULL checkJohn Fastabend2011-11-031-21/+12Star
| * | ixgbe: fix disabling of Tx laser at probeEmil Tantilov2011-11-031-7/+7
| * | ixgbe: Fix link issues caused by a reset while interface is downEmil Tantilov2011-11-031-1/+0Star
| * | igb: Fix for I347AT4 PHY cable length unit detectionKantecki, Tomasz2011-11-031-1/+1
| * | e100: make sure vlan support isn't advertised on old adaptersJesse Brandeburg2011-11-031-0/+4
| * | e1000e: demote a debugging WARN to a debug log messageBruce Allan2011-11-031-2/+1Star
| * | net: fix typo in drivers/net/ethernet/xilinx/ll_temac_main.cStephen Rothwell2011-11-021-2/+2
| * | net/ethernet: Move mac89x0.c from apple to cirrusGeert Uytterhoeven2011-11-025-14/+14
| * | net/ethernet: sc92031 is not RealtekCesar Eduardo Barros2011-11-027-13/+40
| * | drivers/net/ethernet/i825xx/3c505.c: fix build with dynamic debugAndrew Morton2011-11-011-4/+2Star
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2011-11-032-13/+37
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-11-0110-30/+147
|/ /
* | treewide: use __printf not __attribute__((format(printf,...)))Joe Perches2011-11-011-1/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-10-3119-428/+478
|\ \ | |/ |/|
| * qlcnic: fix beacon and LED test.Sucheta Chakraborty2011-10-303-31/+57
| * qlcnic: updated reset sequenceSony Chacko2011-10-302-2/+50
| * qlcnic: reset loopback mode if promiscous mode setting fails.Sucheta Chakraborty2011-10-301-1/+1