From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 8 Feb 2007 03:32:36 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.21-rc1~92^2~27
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=905adce4094d64a6691df994e424fbf486301adc;p=linux-2.6

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: (23 commits)
  ide-acpi support warning fix
  ACPI support for IDE devices
  IDE Driver for Delkin/Lexar/etc.. cardbus CF adapter
  ide: it8213 IDE driver update (version 2)
  ide: add it8213 IDE driver
  tc86c001: add missing __init tag for tc86c001_ide_init()
  tc86c001: mark init_chipset_tc86c001() with __devinit tag
  tc86c001: init_hwif_tc86c001() can be static
  ide: add Toshiba TC86C001 IDE driver (take 2)
  pdc202xx_new: remove check_in_drive_lists abomination
  pdc202xx_new: remove useless code
  slc90e66: carry over fixes from piix driver
  piix: tuneproc() fixes/cleanups
  piix: fix 82371MX enablebits
  hpt366: HPT36x PCI clock detection fix
  hpt366: init code rewrite
  hpt366: clean up DMA timeout handling for HPT370
  hpt366: merge HPT37x speedproc handlers
  hpt366: cache channel's MCR address
  hpt366: switch to using pci_get_slot
  ...
---

905adce4094d64a6691df994e424fbf486301adc