diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-27 10:00:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-27 10:00:23 -0700 |
commit | 75ca0d22668a36fc83e17407d369b528a22c562c (patch) | |
tree | 81934436cdeb95d4a51d95481a1c6b973609d38e /arch/ia64/sn/kernel/xp_nofault.S | |
parent | 7af5f532a23c421ab9a70b1a9a78c722d26d95ff (diff) | |
parent | 40a1d531f6c894b298e784fd2090d87633e4989a (diff) | |
download | talos-obmc-linux-75ca0d22668a36fc83e17407d369b528a22c562c.tar.gz talos-obmc-linux-75ca0d22668a36fc83e17407d369b528a22c562c.zip |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: kill ATA_HORKAGE_DMA_RW_ONLY
libata: use PIO for non-16 byte aligned ATAPI commands
libata: call ata_check_atapi_dma() with qc better prepared
libata: fix infinite EH waiting bug
libata: fix ata_dev_disable()
pata_it821x: fix section mismatch warning
libata: remove unused variable from ata_eh_reset()
libata: be less verbose about hpa
libata: kill non-sense warning message
libata: kill the infamous abnormal status message
HPT374 is UDMA100 not UDMA133
Diffstat (limited to 'arch/ia64/sn/kernel/xp_nofault.S')
0 files changed, 0 insertions, 0 deletions