From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 3 Jul 2007 20:58:49 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.22~33
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9d7542f891f22d16ea1465d19d253888e87f7ad6;p=~shefty%2Frdma-dev.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: ide_scan_pcibus(): check __pci_register_driver return value
  ide: pdc202xx_new PLL input clock fix
  it821x: fix incorrect SWDMA mask
  amd74xx: resume fix
  hpt366: use correct enablebits for HPT36x
  hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66
  ide: Fix a theoretical Ooops case
  ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy
---

9d7542f891f22d16ea1465d19d253888e87f7ad6