Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (29 commits) ide: re-implement ide_pci_init_one() on top of ide_pci_init_two() ide: unexport ide_find_dma_mode() ide: fix PowerMac bootup oops ide: skip probe if there are no devices on the port (v2) sl82c105: add printk() logging facility ide-tape: fix proc warning ide: add IDE_DFLAG_NIEN_QUIRK device flag ide: respect quirk_drives[] list on all controllers hpt366: enable all quirks for devices on quirk_drives[] list hpt366: sync quirk_drives[] list with pdc202xx_{new,old}.c ide: remove superfluous SELECT_MASK() call from do_rw_taskfile() ide: remove superfluous SELECT_MASK() call from ide_driveid_update() icside: remove superfluous ->maskproc method ide-tape: fix IDE_AFLAG_* atomic accesses ide-tape: change IDE_AFLAG_IGNORE_DSC non-atomically pdc202xx_old: kill resetproc() method pdc202xx_old: don't call pdc202xx_reset() on IRQ timeout pdc202xx_old: use ide_dma_test_irq() ide: preserve Host Protected Area by default (v2) ide-gd: implement block device ->set_capacity method (v2) ...
No related branches found
No related tags found
Showing
- Documentation/ide/ide.txt 2 additions, 0 deletionsDocumentation/ide/ide.txt
- Documentation/kernel-parameters.txt 2 additions, 5 deletionsDocumentation/kernel-parameters.txt
- drivers/ide/at91_ide.c 3 additions, 4 deletionsdrivers/ide/at91_ide.c
- drivers/ide/au1xxx-ide.c 4 additions, 4 deletionsdrivers/ide/au1xxx-ide.c
- drivers/ide/buddha.c 4 additions, 5 deletionsdrivers/ide/buddha.c
- drivers/ide/cmd640.c 3 additions, 4 deletionsdrivers/ide/cmd640.c
- drivers/ide/cs5520.c 2 additions, 2 deletionsdrivers/ide/cs5520.c
- drivers/ide/delkin_cb.c 3 additions, 3 deletionsdrivers/ide/delkin_cb.c
- drivers/ide/falconide.c 4 additions, 5 deletionsdrivers/ide/falconide.c
- drivers/ide/gayle.c 4 additions, 5 deletionsdrivers/ide/gayle.c
- drivers/ide/hpt366.c 1 addition, 24 deletionsdrivers/ide/hpt366.c
- drivers/ide/icside.c 11 additions, 66 deletionsdrivers/ide/icside.c
- drivers/ide/ide-4drives.c 3 additions, 3 deletionsdrivers/ide/ide-4drives.c
- drivers/ide/ide-atapi.c 1 addition, 1 deletiondrivers/ide/ide-atapi.c
- drivers/ide/ide-cs.c 3 additions, 3 deletionsdrivers/ide/ide-cs.c
- drivers/ide/ide-disk.c 63 additions, 12 deletionsdrivers/ide/ide-disk.c
- drivers/ide/ide-dma.c 0 additions, 1 deletiondrivers/ide/ide-dma.c
- drivers/ide/ide-eh.c 7 additions, 7 deletionsdrivers/ide/ide-eh.c
- drivers/ide/ide-gd.c 14 additions, 0 deletionsdrivers/ide/ide-gd.c
- drivers/ide/ide-generic.c 3 additions, 4 deletionsdrivers/ide/ide-generic.c
Loading
Please register or sign in to comment