summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-10-1612-216/+558
|\
| * WOL bugfix for 3c59x.cSteffen Klassert2007-10-161-1/+7
| * skge 1.12Stephen Hemminger2007-10-161-1/+1
| * skge: add a debug interfaceStephen Hemminger2007-10-163-0/+156
| * skge: eeprom supportStephen Hemminger2007-10-162-2/+102
| * skge: internal statsStephen Hemminger2007-10-162-30/+24
| * skge: XM PHY handling fixesStephen Hemminger2007-10-162-44/+50
| * skge: changing MTU while running causes problemsStephen Hemminger2007-10-161-7/+44
| * skge: fix ram buffer size calculationStephen Hemminger2007-10-161-27/+24
| * gianfar: Fix compile regression caused by 09f75cd7Li Yang2007-10-161-4/+3
| * net: Fix new EMAC driver for NAPI changesBenjamin Herrenschmidt2007-10-161-8/+17
| * bonding: two small fixes for IPoIB supportJay Vosburgh2007-10-162-8/+7
| * e1000e: don't poke PHY registers to retreive link statusAuke Kok2007-10-161-10/+21
| * e1000e: fix error checksAdrian Bunk2007-10-161-2/+2
| * e1000e: Fix debug printk macroAuke Kok2007-10-161-1/+1
| * tokenring/3c359.c: fixed array index problemMarcus Meissner2007-10-161-1/+1
| * [netdrvr] forcedeth: remove in-driver copy of net_device_statsJeff Garzik2007-10-161-36/+36
| * [netdrvr] forcedeth: improved probe info; dev_printk() cleanupsJeff Garzik2007-10-161-31/+57
| * forcedeth: fix NAPI rx poll functionIngo Molnar2007-10-161-3/+5
* | missing include in mmcAl Viro2007-10-161-0/+1
* | fix adbhid mismergeAl Viro2007-10-161-1/+1
|/
* Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2007-10-1646-1689/+442
|\
| * amd74xx: remove /proc/ide/amd74xxBartlomiej Zolnierkiewicz2007-10-161-129/+1
| * amd74xx/via82cxxx: don't initialize drive->dnBartlomiej Zolnierkiewicz2007-10-162-2/+0
| * sis5513: remove /proc/ide/sisBartlomiej Zolnierkiewicz2007-10-161-248/+1
| * ide: remove CONFIG_IDEDMA_ONLYDISKBartlomiej Zolnierkiewicz2007-10-162-14/+1
| * ide: add "hdx=nodma" kernel parameterBartlomiej Zolnierkiewicz2007-10-162-3/+6
| * ide: remove hwif->autodma and drive->autodmaBartlomiej Zolnierkiewicz2007-10-1640-247/+14
| * ide: remove "idex=dma" kernel parameterBartlomiej Zolnierkiewicz2007-10-161-4/+2
| * ide: remove CONFIG_BLK_DEV_IDEDMA_FORCEDBartlomiej Zolnierkiewicz2007-10-162-51/+3
| * ide: use PCI_VDEVICE() macroBartlomiej Zolnierkiewicz2007-10-1632-181/+174
| * sis5513: clear prefetch and postwrite for ATAPI devicesBartlomiej Zolnierkiewicz2007-10-161-7/+6
| * it8213/piix/slc90e66: "de-couple" PIO and UDMA modesBartlomiej Zolnierkiewicz2007-10-163-17/+13
| * ide: unexport noautodmaAdrian Bunk2007-10-161-2/+0
| * ide: unexport ide_tune_dmaAdrian Bunk2007-10-161-2/+0
| * ide: remove ->ide_dma_check (take 2)Bartlomiej Zolnierkiewicz2007-10-1641-499/+76
| * ide-pmac: add PIO autotune fallback to ->ide_dma_checkBartlomiej Zolnierkiewicz2007-10-161-0/+2
| * ide-cris: add PIO autotune fallback to ->ide_dma_checkBartlomiej Zolnierkiewicz2007-10-161-0/+2
| * sl82c105: add PIO autotune fallback to ->ide_dma_checkBartlomiej Zolnierkiewicz2007-10-161-0/+2
| * cs5530/sc1200: add PIO autotune fallback to ->ide_dma_checkBartlomiej Zolnierkiewicz2007-10-162-4/+8
| * ide: remove ide_use_fast_pio()Bartlomiej Zolnierkiewicz2007-10-1616-45/+15
| * ide: remove drive->init_speed zeroingBartlomiej Zolnierkiewicz2007-10-1611-22/+0
| * au1xxx-ide: use ide_tune_dma()Bartlomiej Zolnierkiewicz2007-10-161-14/+22
| * it8213/piix/slc90e66: remove {it8213,piix,slc90e66}_dma_2_pio()Bartlomiej Zolnierkiewicz2007-10-163-88/+33
| * atiixp: DMA setup fixesBartlomiej Zolnierkiewicz2007-10-161-48/+5
| * sc1200: always tune PIOBartlomiej Zolnierkiewicz2007-10-161-1/+4
| * cs5530: always tune PIOBartlomiej Zolnierkiewicz2007-10-161-13/+6
| * ide-cris: always tune PIOBartlomiej Zolnierkiewicz2007-10-161-0/+2
| * slc90e66: always tune PIOBartlomiej Zolnierkiewicz2007-10-161-5/+5
| * aec62xx: always tune PIOBartlomiej Zolnierkiewicz2007-10-161-4/+4