summaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge' into powerpc-nextPaul Mackerras2008-05-2331-57/+110
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-217-22/+40
| |\
| | * cassini: Only use chip checksum for ipv4 packets.David S. Miller2008-05-211-4/+7
| | * libertas: Fix ethtool statisticsDavid Woodhouse2008-05-201-14/+13
| | * orinoco_cs: add ID for SpeedStream wireless adaptersPavel Roskin2008-05-201-0/+1
| | * hostap_cs: add ID for Conceptronic CON11CProPavel Roskin2008-05-201-0/+1
| | * rtl8187: resource leak in error caseOliver Neukum2008-05-201-2/+12
| | * ath5k: Fix loop variable initializationsBob Copeland2008-05-202-2/+6
| * | missing dependencies on HAS_DMAAl Viro2008-05-213-3/+3
| * | irda-usb endianness annotations and fixesAl Viro2008-05-212-3/+3
| * | misc drivers/net endianness noiseAl Viro2008-05-216-14/+16
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-206-13/+27
| |\ \ | | |/
| | * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville...David S. Miller2008-05-194-6/+9
| | |\
| | | * wireless: Create 'device' symlink in sysfsMasakazu Mokuno2008-05-163-0/+3
| | | * wireless, airo: waitbusy() won't delayRoel Kluin2008-05-161-1/+1
| | | * libertas: fix command timeout after firmware failureBrian Cavagnolo2008-05-161-0/+1
| | | * hostap: fix "registers" registration in procfsMathieu Chouquet-Stringer2008-05-151-5/+4
| | * | l2tp: avoid skb truesize bug if headroom is increasedJames Chapman2008-05-191-5/+8
| | |/
| | * bonding: handle case of device named bonding_masterStephen Hemminger2008-05-141-2/+10
| * | USB: build fixIngo Molnar2008-05-201-1/+1
| * | m68k: Some network drivers do not check the platformGeert Uytterhoeven2008-05-185-0/+19
| * | byteorder: don't directly include linux/byteorder/generic.hHarvey Harrison2008-05-161-1/+1
| |/
* | Merge branch 'linux-2.6' into powerpc-nextPaul Mackerras2008-05-1659-636/+3176
|\ \ | |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-05-1459-636/+3176
| |\
| | * ppp: Do not free not yet unregistered net device.Pavel Emelyanov2008-05-131-0/+1
| | * DM9000: Use delayed work to update MII PHY stateBen Dooks2008-05-131-0/+26
| | * DM9000: Update and fix driver debugging messagesEnrico Scholz2008-05-131-1/+4
| | * DM9000: Add __devinit and __devexit attributes to probe and removeEnrico Scholz2008-05-131-3/+3
| | * sky2: fix simple define thinkoJesse Brandeburg2008-05-131-2/+2
| | * [netdrvr] sfc: sfc: Add self-test supportBen Hutchings2008-05-1314-7/+1379
| | * [netdrvr] sfc: Increment rx_reset when reported as driver eventBen Hutchings2008-05-131-0/+1
| | * [netdrvr] sfc: Remove unused macro EFX_XAUI_RETRAIN_MAXBen Hutchings2008-05-131-2/+0
| | * [netdrvr] sfc: Fix code formattingBen Hutchings2008-05-131-2/+2
| | * [netdrvr] sfc: Remove kernel-doc comments for removed members of struct efx_nicBen Hutchings2008-05-131-2/+0
| | * [netdrvr] sfc: Remove garbage from commentBen Hutchings2008-05-131-1/+1
| | * [netdrvr] sfc: Removed bogus 'fall-thru' commentsBen Hutchings2008-05-132-3/+0
| | * [netdrvr] sfc: Add phy_flash_cfg module parameter and implementationBen Hutchings2008-05-134-4/+26
| | * [netdrvr] sfc: Add TSO supportBen Hutchings2008-05-134-1/+708
| | * ehea: Add DLPAR memory remove supportHannes Hering2008-05-133-84/+254
| | * ehea: Add dependency to KconfigHannes Hering2008-05-131-1/+1
| | * gianfar: Fix a bug where the pointer never moves for dma_unmap...Andy Fleming2008-05-131-0/+2
| | * cxgb3 - fix EEHDivy Le Ray2008-05-135-6/+70
| | * cxgb3 - fix port up/down error pathDivy Le Ray2008-05-132-15/+18
| | * myri10ge: fix the number of interrupt slotsBrice Goglin2008-05-131-9/+5
| | * myri10ge: cleanup retrieving of firmware capabilitiesBrice Goglin2008-05-131-11/+31
| | * myri10ge: move data structures into a single sliceBrice Goglin2008-05-131-278/+316
| | * myri10ge: fix potential infinite loop in enable_ecrcBrice Goglin2008-05-131-2/+3
| | * myri10ge: trivial formatting fixBrice Goglin2008-05-131-1/+4
| | * myri10ge: add barrier in myri10ge_send_cmdBrice Goglin2008-05-131-1/+3
| | * myri10ge: report FIBER in ethtool for XFP based NICBrice Goglin2008-05-131-0/+35
OpenPOWER on IntegriCloud