From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 4 Mar 2007 21:31:00 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.21-rc3~98
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20b0f65d35ae45d43f363ace3744a775a752d265;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:
  ide: make legacy IDE VLB modules check for the "probe" kernel params (v2)
  ide: remove some obsoleted kernel params (v2)
  ide/pci/delkin_cb.c: pci_module_init to pci_register_driver
  scc_pata: bugfix for checking DMA IRQ status
  ide: remove a ton of pointless #undef REALLY_SLOW_IO
  siimage: DRAC4 note
  adjust legacy IDE resource setting (v2)
  ide: fix pmac breakage
  ide-cs: Update device table
  ide: ide_get_best_pio_mode() returns incorrect IORDY setting (take 2)
  piix/slc90e66: more tuneproc() fixing (take 2)
  ide: fix drive side 80c cable check, take 2
  cmd64x: fix PIO mode setup (take 3)
  alim15x3: fix PIO mode setup
---

20b0f65d35ae45d43f363ace3744a775a752d265