aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/l...Linus Torvalds2010-03-011-4/+4
|\
| * ACPI: replace acpi_integer by u64Lin Ming2010-01-281-4/+4
* | Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-03-013-6/+5
|\ \
| * | block: Consolidate phys_segment and hw_segment limitsMartin K. Petersen2010-02-261-2/+1
| * | block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectorsMartin K. Petersen2010-02-263-4/+4
| |/
* | MIPS: Alchemy: change dbdma to accept physical memory addressesManuel Lauss2010-02-271-4/+4
* | MIPS: Alchemy: remove dbdma compat macrosManuel Lauss2010-02-271-12/+9
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2009-12-121-35/+57
|\
| * Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-12-093-24/+14
| |\
| * | powerpc/macio: Rework hotplug media bay supportBenjamin Herrenschmidt2009-12-091-35/+57
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6Linus Torvalds2009-12-0914-219/+37
|\ \ \ | |_|/ |/| |
| * | Merge branch 'ide-dcr' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/...David S. Miller2009-12-036-102/+2
| |\ \
| | * | sl82c105: remove no longer needed debugging codeBartlomiej Zolnierkiewicz2009-12-031-23/+1
| | * | sis5513: remove stale TODOBartlomiej Zolnierkiewicz2009-12-031-9/+0
| | * | pdc202xx_old: remove no longer needed debugging codeBartlomiej Zolnierkiewicz2009-12-031-15/+0
| | * | cy82c693: remove no longer needed debugging codeBartlomiej Zolnierkiewicz2009-12-031-27/+0
| | * | cmd64x: remove no longer needed debugging codeBartlomiej Zolnierkiewicz2009-12-031-17/+0
| | * | alim15x3: remove obsolete and dangerous wdc_udma parameterBartlomiej Zolnierkiewicz2009-12-031-11/+1
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/id...David S. Miller2009-12-025-14/+7
| |\ \ \
| | * | | cs5535: add pci id for AMD based CS5535 controllersBartlomiej Zolnierkiewicz2009-12-021-0/+1
| | * | | slc90e66: fix UDMA handlingBartlomiej Zolnierkiewicz2009-12-011-2/+1
| * | | | drivers/ide/tx4938ide.c: use resource_size()H Hartley Sweeten2009-11-231-1/+1
| * | | | drivers/ide/ide_platform.c: use resource_size()H Hartley Sweeten2009-11-231-4/+4
| * | | | drivers/ide/au1xxx-ide.c: use resource_size()H Hartley Sweeten2009-11-231-4/+3
| * | | | hpt366: remove dead old timing tablesBartlomiej Zolnierkiewicz2009-11-181-63/+0
| * | | | ide: update Kconfig text to mark as deprecatedRobert Hancock2009-10-291-35/+10
| * | | | ide-tape: remove the BKLBorislav Petkov2009-10-291-6/+15
| * | | | hpt366: kill unused #define'sSergei Shtylyov2009-10-291-2/+0
* | | | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2009-12-081-1/+2
|\ \ \ \ \
| * | | | | pata_piccolo: Driver for old Toshiba chipsetsAlan Cox2009-12-031-1/+2
| | |_|/ / | |/| | |
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2009-12-051-22/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | pcmcia: rework the irq_req_t typedefDominik Brodowski2009-11-281-1/+0
| * | | | pcmcia: use dynamic debug infrastructure, deprecate CS_CHECK (ide)Dominik Brodowski2009-11-081-21/+11
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2009-11-301-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | ide: fix ioctl to pass requested transfer mode to ide_find_dma_mode instead o...Hemant Pedanekar2009-11-251-1/+1
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2009-11-091-9/+0
|\ \ \ \ | |/ / /
| * | | Revert "ide: try to use PIO Mode 0 during probe if possible"David S. Miller2009-11-061-9/+0
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2009-10-291-2/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | ide: Serialize CMD643 and CMD646 to fix a hardware bug with SSDMikulas Patocka2009-10-291-2/+4
* | | ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2Shane Huang2009-10-161-1/+1
| |/ |/|
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2009-10-082-4/+15
|\ \ | |/
| * Revert "Revert "ide: try to use PIO Mode 0 during probe if possible""Bartlomiej Zolnierkiewicz2009-10-071-0/+9
| * sis5513: fix PIO setup for ATAPI devicesBartlomiej Zolnierkiewicz2009-10-071-4/+6
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2009-10-052-16/+1
|\ \ | |/
| * Revert "ide: try to use PIO Mode 0 during probe if possible"David S. Miller2009-10-041-9/+0
| * ide: use printk_onceMarcin Slusarz2009-09-221-7/+1
* | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2009-09-231-4/+1
|\ \ | |/ |/|
| * Merge branch 'acpica' into releaseLen Brown2009-09-191-4/+1
| |\
| | * ACPICA: Major update for acpi_get_object_info external interfaceBob Moore2009-08-271-4/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-09-222-3/+3
|\ \ \