summaryrefslogtreecommitdiffstats
path: root/drivers/ide
Commit message (Expand)AuthorAgeFilesLines
* m68k: amiga - Amiga Gayle IDE platform device conversionGeert Uytterhoeven2010-05-261-65/+82
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2010-05-243-6/+6
|\
| * cmd640: fix kernel oops in test_irq() methodSergei Shtylyov2010-05-111-4/+2
| * pdc202xx_old: ignore "FIFO empty" bit in test_irq() methodSergei Shtylyov2010-04-221-2/+2
| * pdc202xx_old: wire test_irq() method for PDC2026xSergei Shtylyov2010-04-221-0/+1
| * IDE: pass IRQ flags to the IDE coreYegor Yefremov2010-04-151-0/+1
* | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-223-44/+31
|\ \
| * \ Merge branch 'master' into for-2.6.35Jens Axboe2010-05-211-15/+9
| |\ \
| | * | pcmcia: dev_node removal (drivers with updated printk call)Dominik Brodowski2010-05-101-8/+4
| | * | pcmcia: re-work pcmcia_request_irq()Dominik Brodowski2010-05-101-5/+3
| | * | pata_pcmcia / ide-cs: Fix bad hashes for Transcend and kingston IDsKristoffer Ericson2010-05-051-2/+2
| * | | block,ide: simplify bdops->set_capacity() to ->unlock_native_capacity()Tejun Heo2010-05-212-31/+20
| |/ /
| * | pata_pcmcia/ide-cs: add IDs for transcend and kingston cardsKristoffer Ericson2010-04-221-0/+4
* | | of: Always use 'struct device.of_node' to get device node pointer.Grant Likely2010-05-181-5/+5
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2010-04-084-6/+5
|\|
| * ide: Fix IDE taskfile with cfq schedulerMikulas Patocka2010-04-061-4/+2
| * ide: Must hold queue lock when requeueingHerbert Xu2010-04-011-1/+1
| * ide: Requeue request after DMA timeoutHerbert Xu2010-04-012-1/+2
* | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3019-3/+16
|/
* Revert "ide: skip probe if there are no devices on the port (v2)"David S. Miller2010-03-281-9/+3
* Revert "via82cxxx: workaround h/w bugs"David S. Miller2010-03-271-57/+0
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6Linus Torvalds2010-03-0450-638/+611
|\
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/id...David S. Miller2010-03-025-26/+79
| |\
| | * ide: fixed section mismatch warning in cmd640.cChris Frey2010-01-281-1/+1
| | * ide/ide-cs: fix order of releasing resourcesWolfram Sang2010-01-151-12/+11
| | * ide: Fix Promise UDMA33 IDE driver (pdc202xx_old)Russell King2010-01-121-2/+2
| | * icside: bring back ->maskproc methodBartlomiej Zolnierkiewicz2010-01-121-4/+60
| | * scc_pata: fix module unloadingBartlomiej Zolnierkiewicz2010-01-081-7/+5
| * | drivers/ide: Fix continuation line formatsJoe Perches2010-02-032-4/+4
| * | ide: ide_timing_compute() fixupBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | ide: make ide_get_best_pio_mode() staticBartlomiej Zolnierkiewicz2010-01-191-2/+1
| * | via82cxxx: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | tx493xide: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-192-2/+2
| * | siimage: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | palm_bk3710: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | it821x: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | cs5536: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | cs5535: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | cmd64x: fix handling of address setup timingsBartlomiej Zolnierkiewicz2010-01-191-7/+10
| * | amd74xx: use ->pio_mode value to determine pair device speedBartlomiej Zolnierkiewicz2010-01-191-1/+1
| * | alim15x3: fix handling of UDMA enable bitBartlomiej Zolnierkiewicz2010-01-191-25/+18
| * | alim15x3: fix handling of DMA timingsBartlomiej Zolnierkiewicz2010-01-191-16/+39
| * | alim15x3: fix handling of command timingsBartlomiej Zolnierkiewicz2010-01-191-2/+7
| * | alim15x3: fix handling of address setup timingsBartlomiej Zolnierkiewicz2010-01-191-0/+11
| * | ide-timings: use ->pio_mode value to determine fastest PIO speedBartlomiej Zolnierkiewicz2010-01-191-3/+2
| * | ide: change ->set_dma_mode method parametersBartlomiej Zolnierkiewicz2010-01-1935-86/+100
| * | ide: change ->set_pio_mode method parametersBartlomiej Zolnierkiewicz2010-01-1943-120/+128
| * | ide: add drive->dma_mode fieldBartlomiej Zolnierkiewicz2010-01-192-0/+3
| * | ide: add drive->pio_mode fieldBartlomiej Zolnierkiewicz2010-01-193-0/+7
| * | via82cxxx: fix UDMA settings programmingBartlomiej Zolnierkiewicz2010-01-191-2/+17