summaryrefslogtreecommitdiffstats
path: root/drivers/ide
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ideLinus Torvalds2011-11-184-13/+29
|\
| * cy82c693: fix PCI device selectionBartlomiej Zolnierkiewicz2011-10-131-3/+3
| * icside: DMA support fixBartlomiej Zolnierkiewicz2011-10-131-1/+1
| * IDE: Don't powerdown Compaq Triflex IDE device on suspendMikulas Patocka2011-10-131-1/+15
| * piix: ICH7 MWDMA1 errataBartlomiej Zolnierkiewicz2011-10-111-8/+10
* | ide-{cd,floppy,tape}: Do not include <linux/irq.h>Geert Uytterhoeven2011-11-083-3/+0
* | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-0621-0/+21
|\ \
| * | ide/ata: Add module.h to the implicit modular usersPaul Gortmaker2011-10-318-0/+8
| * | ide/ata: Add export.h for EXPORT_SYMBOL/THIS_MODULE where neededPaul Gortmaker2011-10-3113-0/+13
* | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2011-11-032-22/+30
|\ \ \ | |/ / |/| |
| * | MIPS: Alchemy: remove all CONFIG_SOC_AU1??? definesManuel Lauss2011-10-241-3/+3
| * | MIPS: Alchemy: kill au1xxx.h headerManuel Lauss2011-10-241-1/+1
| * | MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header depManuel Lauss2011-10-241-18/+26
* | | Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-c...Linus Torvalds2011-10-271-1/+1
|\ \ \
| * | | ARM: gpio: at91: convert drivers to use asm/gpio.h rather than mach/gpio.hRussell King2011-08-081-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-10-251-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Kconfig: remove redundant CONFIG_ prefix on two symbolsPaul Bolle2011-10-131-1/+1
| * | | Fix file references in drivers/ide/Johann Felix Soden2011-10-101-12/+12
| |/ /
* | | ide: Fix file references in drivers/ide/Johann Felix Soden2011-10-131-12/+12
| |/ |/|
* | ide-disk: Fix request requeuingBorislav Petkov2011-10-031-1/+6
|/
* drivers/ide/cy82c693.c: Add missing pci_dev_putJulia Lawall2011-08-041-0/+2
* ide: Fix irq flags madnessThomas Gleixner2011-08-041-1/+5
* Merge branch 'master' into for-nextJiri Kosina2011-07-111-1/+2
|\
| * ide-cd: signedness warning fix againConnor Hansen2011-06-111-1/+2
* | treewide: Convert uses of struct resource to resource_size(ptr)Joe Perches2011-06-102-3/+3
|/
* block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removalLinus Torvalds2011-06-021-1/+0
* Merge branch 'for-2.6.40/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-05-251-1/+2
|\
| * Merge commit 'v2.6.39' into for-2.6.40/coreJens Axboe2011-05-202-1/+12
| |\
| * | block: don't block events on excl write for non-optical devicesTejun Heo2011-04-211-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2011-05-241-1/+1
|\ \ \
| * | | pcmcia: Convert pcmcia_device_id declarations to constJoe Perches2011-05-061-1/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6Linus Torvalds2011-05-224-6/+6
|\ \ \ | |/ / |/| |
| * | ide/ide-scan-pci.c: Use for_each_pci_dev().Thiago Farina2011-05-161-1/+1
| * | IDE: ide-floppy, remove unnecessary NULL checkJiri Slaby2010-11-221-1/+1
| * | drivers/ide/pmac.c: Remove unnecessary casts of pci_get_drvdataJoe Perches2010-11-221-2/+2
| * | ide: fix use after free in ide-acpiMariusz Kozlowski2010-11-221-2/+2
* | | ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cdTejun Heo2011-04-213-2/+12
| |/ |/|
* | Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds2011-04-077-9/+9
|\ \
| * | Fix common misspellingsLucas De Marchi2011-03-317-9/+9
* | | ide: always ensure that blk_delay_queue() is called if we have pending IOJens Axboe2011-04-051-21/+21
* | | ide: ide_requeue_and_plug() reinstate "always plug" behaviourJens Axboe2011-04-051-2/+1
|/ /
* | ide: ensure that we re-run the queue handlerJens Axboe2011-03-261-1/+11
* | Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-03-247-33/+24
|\ \
| * \ Merge branch 'for-2.6.39/stack-plug' into for-2.6.39/coreJens Axboe2011-03-104-18/+4
| |\ \
| | * | block: remove per-queue pluggingJens Axboe2011-03-103-7/+2
| | * | ide-cd: convert to blk_delay_queue() for a short pauseJens Axboe2011-03-101-11/+2
| * | | ide: Convert to bdops->check_events()Tejun Heo2011-03-094-15/+20
| |/ /
* | | ide: change to new flag variablematt mooney2011-03-171-1/+1
|/ /
* | kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERTDavid Rientjes2011-01-201-1/+1
|/
* ide: clean up timed out request handlingTejun Heo2010-10-261-8/+3
OpenPOWER on IntegriCloud