]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitaba2d3938983eaf972be44cd90e9992a5c079fcc
tree5da1a4088901063a04a6ee269d7195da6178a533
parentb70c0a6518a8aa328f5253e1e27b0afa8e47cb6d
parent774ba6ca540e340c35fb8358d92ce404e277734b
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"