Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 Jan 2008 22:31:16 +0000 (14:31 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 10 Jan 2008 22:31:16 +0000 (14:31 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  trm290: do hook dma_host_{on,off} methods (take 2)
  ide: fix cable detection for SATA bridges
  ide: workaround suspend bug for ACPI IDE


Trivial merge