From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Dec 2008 03:50:09 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
X-Git-Tag: v2.6.28-rc8~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3;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:
  ide: build-fix for CONFIG_BLK_DEV_IDEDMA_PMAC=n
  Revert "ide: respect current DMA setting during resume"
---

7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3