commit a9e82d3a02247af6b729be0a963862d70cb25bf9
author Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Oct 18 16:00:02 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Thu Oct 18 16:00:02 2007 -0700
tree 8f1f02bf0f1371391f2077a270bc32c0beddcc6a
parent 58f9b52ee8712283f7ffedb661df678c61e88a91
parent 85ad93ad56f4baf52e7c40f2e01c4df8e14d4c9c

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: (37 commits)
  ide: set drive->autotune in ide_pci_setup_ports()
  triflex: always tune PIO
  opti621: always tune PIO
  cy82c693: always tune PIO
  cs5520: always tune PIO
  alim15x3: always tune PIO
  ide: add IDE_HFLAG_LEGACY_IRQS host flag
  ide: add IDE_HFLAG_SERIALIZE host flag
  ide: add IDE_HFLAG_ERROR_STOPS_FIFO host flag
  piix: add DECLARE_ICH_DEV() macro
  pdc202xx_old: add DECLARE_PDC2026X_DEV() macro
  pdc202xx_new: add DECLARE_PDCNEW_DEV() macro
  aec62xx: no need to disable UDMA in ->init_hwif method for ATP850UF
  ide: remove .init_setup from ide_pci_device_t
  serverworks: remove ->init_setup
  scc_pata: remove ->init_setup
  pdc202xx_old: remove ->init_setup
  pdc202xx_new: remove ->init_setup
  hpt366: remove ->init_setup
  cmd64x: remove ->init_setup
  ...