From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Apr 2010 14:45:36 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
X-Git-Tag: v2.6.34-rc4~20
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30

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
---

cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30