From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 10 Jan 2008 22:31:16 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.24-rc8~51
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=318851b08fb9d426a545f76e56f2cc049831fb40;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* 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
---

318851b08fb9d426a545f76e56f2cc049831fb40