Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (59 commits) ide-floppy: do not complete rq's prematurely ide: be able to build pmac driver without IDE built-in ide-pmac: IDE cable detection on Apple PowerBook ide: inline SELECT_DRIVE() ide: turn selectproc() method into dev_select() method (take 5) MAINTAINERS: move old ide-{floppy,tape} entries to CREDITS (take 2) ide: move data register access out of tf_{read|load}() methods (take 2) ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2) ide-io-std: shorten ide_{in|out}put_data() ide: rename IDE_TFLAG_IN_[HOB_]FEATURE ide: turn set_irq() method into write_devctl() method ide: use ATA_HOB ide-disk: use ATA_ERR ide: add support for CFA specified transfer modes (take 3) ide-iops: only clear DMA words on setting DMA mode ide: identify data word 53 bit 1 doesn't cover words 62 and 63 (take 3) au1xxx-ide: auide_{in|out}sw() should be static ide-floppy: use ide_pio_bytes() ide-{floppy,tape}: fix padding for PIO transfers ide: remove CONFIG_BLK_DEV_IDEDOUBLER config option ...
No related branches found
No related tags found
Showing
- CREDITS 9 additions, 0 deletionsCREDITS
- MAINTAINERS 1 addition, 14 deletionsMAINTAINERS
- drivers/ide/Kconfig 11 additions, 22 deletionsdrivers/ide/Kconfig
- drivers/ide/Makefile 0 additions, 2 deletionsdrivers/ide/Makefile
- drivers/ide/alim15x3.c 5 additions, 5 deletionsdrivers/ide/alim15x3.c
- drivers/ide/at91_ide.c 13 additions, 26 deletionsdrivers/ide/at91_ide.c
- drivers/ide/au1xxx-ide.c 6 additions, 20 deletionsdrivers/ide/au1xxx-ide.c
- drivers/ide/cmd64x.c 0 additions, 6 deletionsdrivers/ide/cmd64x.c
- drivers/ide/cs5530.c 1 addition, 2 deletionsdrivers/ide/cs5530.c
- drivers/ide/cs5536.c 0 additions, 1 deletiondrivers/ide/cs5536.c
- drivers/ide/falconide.c 2 additions, 2 deletionsdrivers/ide/falconide.c
- drivers/ide/gayle.c 1 addition, 11 deletionsdrivers/ide/gayle.c
- drivers/ide/hpt366.c 1 addition, 9 deletionsdrivers/ide/hpt366.c
- drivers/ide/ht6560b.c 18 additions, 2 deletionsdrivers/ide/ht6560b.c
- drivers/ide/icside.c 0 additions, 8 deletionsdrivers/ide/icside.c
- drivers/ide/ide-atapi.c 55 additions, 113 deletionsdrivers/ide/ide-atapi.c
- drivers/ide/ide-cd.c 168 additions, 357 deletionsdrivers/ide/ide-cd.c
- drivers/ide/ide-disk.c 2 additions, 2 deletionsdrivers/ide/ide-disk.c
- drivers/ide/ide-dma-sff.c 4 additions, 13 deletionsdrivers/ide/ide-dma-sff.c
- drivers/ide/ide-dma.c 69 additions, 49 deletionsdrivers/ide/ide-dma.c
Loading
Please register or sign in to comment