Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Dec 2008 03:50:09 +0000 (19:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Dec 2008 03:50:09 +0000 (19:50 -0800)
commit7f336bf1e59a0d49ffc178a5747ed7da25c6a6a3
tree5da1a4088901063a04a6ee269d7195da6178a533
parenta4f4d6df537368297a84e6b9444f403f99bf59f6
parent53846574799884a04a4498f6342400d5c1423c79
Merge git://git./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"