summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* x86: update .gitignore entriesThomas Gleixner2007-10-192-0/+2
* x86: fix global_flush_tlb() bugIngo Molnar2007-10-191-2/+7
* Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-10-1910-79/+108
|\
| * pcnet32: remove private net_device_stats structureDon Fry2007-10-181-26/+25Star
| * vortex_up should initialize "err"Badari Pulavarty2007-10-181-1/+1
| * pcnet32: remove compile warnings in non-napi modeDon Fry2007-10-181-0/+4
| * pcnet32: fix non-napi packet receptionDon Fry2007-10-181-0/+3
| * fix EMAC driver for proper napi_synchronize APIBenjamin Herrenschmidt2007-10-181-1/+1
| * sky2: shutdown cleanupStephen Hemminger2007-10-181-26/+20Star
| * napi_synchronize: waiting for NAPIStephen Hemminger2007-10-181-0/+18
| * forcedeth msi bugfixManfred Spraul2007-10-181-8/+11
| * gianfar: fix obviously wrong #ifdef CONFIG_GFAR_NAPI placementAnton Vorontsov2007-10-181-1/+3
| * fs_enet: Update for API changesScott Wood2007-10-182-12/+17
| * gianfar: remove orphan struct.Sebastian Siewior2007-10-181-1/+0Star
| * forcedeth: fix rx-work condition in nv_rx_process_optimized() tooIngo Molnar2007-10-181-3/+5
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2007-10-1944-1211/+760Star
|\ \
| * | ide: set drive->autotune in ide_pci_setup_ports()Bartlomiej Zolnierkiewicz2007-10-1929-74/+3Star
| * | triflex: always tune PIOBartlomiej Zolnierkiewicz2007-10-191-0/+3
| * | opti621: always tune PIOBartlomiej Zolnierkiewicz2007-10-191-4/+4
| * | cy82c693: always tune PIOBartlomiej Zolnierkiewicz2007-10-191-5/+5
| * | cs5520: always tune PIOBartlomiej Zolnierkiewicz2007-10-191-3/+4
| * | alim15x3: always tune PIOBartlomiej Zolnierkiewicz2007-10-191-5/+5
| * | ide: add IDE_HFLAG_LEGACY_IRQS host flagBartlomiej Zolnierkiewicz2007-10-197-35/+28Star
| * | ide: add IDE_HFLAG_SERIALIZE host flagBartlomiej Zolnierkiewicz2007-10-195-13/+16
| * | ide: add IDE_HFLAG_ERROR_STOPS_FIFO host flagBartlomiej Zolnierkiewicz2007-10-194-8/+9
| * | piix: add DECLARE_ICH_DEV() macroBartlomiej Zolnierkiewicz2007-10-191-63/+47Star
| * | pdc202xx_old: add DECLARE_PDC2026X_DEV() macroBartlomiej Zolnierkiewicz2007-10-191-41/+19Star
| * | pdc202xx_new: add DECLARE_PDCNEW_DEV() macroBartlomiej Zolnierkiewicz2007-10-191-57/+19Star
| * | aec62xx: no need to disable UDMA in ->init_hwif method for ATP850UFBartlomiej Zolnierkiewicz2007-10-191-9/+5Star
| * | ide: remove .init_setup from ide_pci_device_tBartlomiej Zolnierkiewicz2007-10-191-1/+0Star
| * | serverworks: remove ->init_setupBartlomiej Zolnierkiewicz2007-10-191-31/+14Star
| * | scc_pata: remove ->init_setupBartlomiej Zolnierkiewicz2007-10-191-2/+2
| * | pdc202xx_old: remove ->init_setupBartlomiej Zolnierkiewicz2007-10-191-32/+25Star
| * | pdc202xx_new: remove ->init_setupBartlomiej Zolnierkiewicz2007-10-191-59/+49Star
| * | hpt366: remove ->init_setupBartlomiej Zolnierkiewicz2007-10-191-179/+127Star
| * | cmd64x: remove ->init_setupBartlomiej Zolnierkiewicz2007-10-191-27/+12Star
| * | aec62xx: remove ->init_setupBartlomiej Zolnierkiewicz2007-10-191-25/+14Star
| * | ide: use I/O ops directly part #2 (take 2)Bartlomiej Zolnierkiewicz2007-10-194-37/+34Star
| * | ide: use pci_dev->revisionBartlomiej Zolnierkiewicz2007-10-194-27/+10Star
| * | cmd64x: Use dev->revisionAuke Kok2007-10-191-10/+4Star
| * | amd74xx: Omit PCI_REVISION_ID readAuke Kok2007-10-191-1/+0Star
| * | ide: add ->mwdma_mask and ->swdma_mask to ide_pci_device_t (take 2)Bartlomiej Zolnierkiewicz2007-10-1932-177/+185
| * | pdc202xx_old: remove broken SWDMA supportBartlomiej Zolnierkiewicz2007-10-191-5/+1Star
| * | ide: add IDE_HFLAG_NO_LBA48 and IDE_HFLAG_NO_LBA48_DMA host flagsBartlomiej Zolnierkiewicz2007-10-196-11/+14
| * | ide: remove ->init_setup_dma from ide_pci_device_t (take 2)Bartlomiej Zolnierkiewicz2007-10-193-34/+20Star
| * | ide: add IDE_HFLAG_NO_{DMA,AUTODMA} host flagsBartlomiej Zolnierkiewicz2007-10-1934-91/+30Star
| * | ide: add IDE_HFLAG_BOOTABLE host flagBartlomiej Zolnierkiewicz2007-10-1934-136/+109Star
| * | ide: add IDE_HFLAG_NO_ATAPI_DMA host flagBartlomiej Zolnierkiewicz2007-10-1939-58/+40Star
| * | ide: add DECLARE_GENERIC_PCI_DEV() macro to generic IDE PCI host driverBartlomiej Zolnierkiewicz2007-10-191-84/+29Star
| * | siimage: bump driver versionBartlomiej Zolnierkiewicz2007-10-191-1/+1