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)
commitcf90bfe2ebaf9d32f37acbebb7425c280fd6cd30
treed3e3f2067dc423721d698d154e15213aa5b0132d
parent0a2851b9a837cb025d48bb8118f35ebd12bce4b5
parent720fc22a7af79d91ec460c80efa92c65c12d105e
Merge git://git./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