Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (7f336bf1) · Commits · Android-smartphones / zte / blade-a610 / work in progress / mediatek kernel

Commit 7f336bf1 authored Dec 08, 2008 by Linus Torvalds

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"

parents a4f4d6df 53846574

Hide whitespace changes

Inline Side-by-side

Please register or to comment