diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-26 21:13:54 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-26 21:13:54 (GMT) |
| commit | 9c88b702186d4bb1b28c9bdd5f224f3f8ce2ea51 (patch) | |
| tree | b493103681c99e948791f2223d34cd0596faa343 /arch/mips/kernel/genex.S | |
| parent | 291bc047e125ff02c9affe06a7df28bed57b054d (diff) | |
| parent | 513daadd152ddbf32cb6d0447ddba3427ce5b8e8 (diff) | |
| download | linux-fsl-qoriq-9c88b702186d4bb1b28c9bdd5f224f3f8ce2ea51.tar.xz | |
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
Diffstat (limited to 'arch/mips/kernel/genex.S')
0 files changed, 0 insertions, 0 deletions