From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 9 May 2007 22:41:31 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.22-rc1~138
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=3cb7396b7b26585b1ab7c1a8ca554ec103da5d37;hp=3cb7396b7b26585b1ab7c1a8ca554ec103da5d37;p=powerpc.git

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)
---