[LinuxPPS] 9 May 22:41 - Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

[linuxpps: Linus Torvalds <>]

Merge /pub/scm/linux/kernel/git/bart/ide-2.6  
  
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:  
ide: fix PIO setup on resume for ATAPI devices  
ide: legacy PCI bus order probing fixes  
ide: add ide_proc_register_port()  
ide: add "initializing" argument to ide_register_hw()  
ide: cable detection fixes (take 2)  
ide: move IDE settings handling to ide-proc.c  
ide: split off ioctl handling from IDE settings (v2)  
ide: make /proc/ide/ optional  
ide: add ide_tune_dma() helper  
ide: rework the code for selecting the best DMA transfer mode (v3)  
ide: fix UDMA/MWDMA/SWDMA masks (v3)  
  
drivers/ide/Kconfig  
drivers/ide/Makefile  
drivers/ide/arm/bast-ide.c  
drivers/ide/arm/icside.c  
drivers/ide/arm/ide_arm.c  
drivers/ide/arm/rapide.c  
drivers/ide/cris/ide-cris.c  
drivers/ide/h8300/ide-h8300.c  
drivers/ide/ide-cd.c  
drivers/ide/ide-disk.c  
drivers/ide/ide-dma.c  
drivers/ide/ide-floppy.c  
drivers/ide/ide-generic.c  
drivers/ide/ide-io.c  
drivers/ide/ide-iops.c  
drivers/ide/ide-lib.c  
drivers/ide/ide-pnp.c  
drivers/ide/ide-probe.c  
drivers/ide/ide-proc.c  
drivers/ide/ide-tape.c  
drivers/ide/ide.c  
drivers/ide/legacy/ali14xx.c  
drivers/ide/legacy/buddha.c  
drivers/ide/legacy/dtc2278.c  
drivers/ide/legacy/falconide.c  
drivers/ide/legacy/gayle.c  
drivers/ide/legacy/ht6560b.c  
drivers/ide/legacy/ide-cs.c  
drivers/ide/legacy/macide.c  
drivers/ide/legacy/q40ide.c  
drivers/ide/legacy/qd65xx.c  
drivers/ide/legacy/umc8672.c  
drivers/ide/mips/au1xxx-ide.c  
drivers/ide/mips/swarm.c  
drivers/ide/pci/aec62xx.c  
drivers/ide/pci/alim15x3.c  
drivers/ide/pci/amd74xx.c  
drivers/ide/pci/atiixp.c  
drivers/ide/pci/cmd64x.c  
drivers/ide/pci/cs5520.c  
drivers/ide/pci/cs5535.c  
drivers/ide/pci/delkin_cb.c  
drivers/ide/pci/hpt34x.c  
drivers/ide/pci/hpt366.c  
drivers/ide/pci/it8213.c  
drivers/ide/pci/it821x.c  
drivers/ide/pci/jmicron.c  
drivers/ide/pci/pdc202xx_new.c  
drivers/ide/pci/pdc202xx_old.c  
drivers/ide/pci/piix.c  
drivers/ide/pci/scc_pata.c  
drivers/ide/pci/serverworks.c  
drivers/ide/pci/sgiioc4.c  
drivers/ide/pci/siimage.c  
drivers/ide/pci/sis5513.c  
drivers/ide/pci/slc90e66.c  
drivers/ide/pci/tc86c001.c  
drivers/ide/pci/triflex.c  
drivers/ide/ppc/pmac.c  
drivers/ide/setup-pci.c  
drivers/macintosh/mediabay.c  
drivers/scsi/ide-scsi.c  
include/linux/ide.h

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=3cb7396b7b26585b1ab7c1a8ca554ec103da5d37