projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a2851b 720fc22)
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)
* 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

1  2 
drivers/ide/ide-atapi.c patch | diff1 | diff2 | blob | history
drivers/ide/ide-dma.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ide/ide-atapi.c
Simple merge
diff --cc drivers/ide/ide-dma.c
Simple merge
John Crispins staging tree