diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 07:45:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 07:45:36 -0700 |
commit | cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 (patch) | |
tree | d3e3f2067dc423721d698d154e15213aa5b0132d /include/linux/ata.h | |
parent | 0a2851b9a837cb025d48bb8118f35ebd12bce4b5 (diff) | |
parent | 720fc22a7af79d91ec460c80efa92c65c12d105e (diff) | |
download | talos-obmc-linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.tar.gz talos-obmc-linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.zip |
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
Diffstat (limited to 'include/linux/ata.h')
0 files changed, 0 insertions, 0 deletions