]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Apr 2010 14:45:36 +0000 (07:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Apr 2010 14:45:36 +0000 (07:45 -0700)
commit7baf36cfff4b2fcb143cb1a665735c6a0918ec0f
treed3e3f2067dc423721d698d154e15213aa5b0132d
parent6058d7dd6e11c4c690626656834d43b0ade1233b
parenteea7e068d08964164f6d09626d8c0cfec37fc64d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide: Fix IDE taskfile with cfq scheduler
  ide: Must hold queue lock when requeueing
  ide: Requeue request after DMA timeout
drivers/ide/ide-atapi.c
drivers/ide/ide-dma.c