]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 291bc04 513daad)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Mar 2007 21:13:54 +0000 (14:13 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 26 Mar 2007 21:13:54 +0000 (14:13 -0700)
commit9c88b702186d4bb1b28c9bdd5f224f3f8ce2ea51
treeb493103681c99e948791f2223d34cd0596faa343tree | snapshot
parent291bc047e125ff02c9affe06a7df28bed57b054dcommit | diff
parent513daadd152ddbf32cb6d0447ddba3427ce5b8e8commit | diff
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: use correct IDE error recovery
  pdc202xx_new: Enable ATAPI DMA
  ide: cosmetic adaption of drivers/ide/Kconfig concerning SATA
  ide: fix locking for manual DMA enable/disable ("hdparm -d")
  ide: revert "ide: fix drive side 80c cable check, take 2" for now
Linux 2.6 source tree