From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 26 Mar 2007 21:13:54 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.21-rc6~120
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9c88b702186d4bb1b28c9bdd5f224f3f8ce2ea51;p=~emulex%2Finfiniband.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: use correct IDE error recovery
  pdc202xx_new: Enable ATAPI DMA
  ide: cosmetic adaption of drivers/ide/Kconfig concerning SATA
  ide: fix locking for manual DMA enable/disable ("hdparm -d")
  ide: revert "ide: fix drive side 80c cable check, take 2" for now
---

9c88b702186d4bb1b28c9bdd5f224f3f8ce2ea51