commit | fffe566b8f735fa71b38c7cc487b471b85894401 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jul 02 21:01:13 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jul 02 21:01:13 2007 -0700 |
tree | 98cb948327f7f8d3be41581c9af0e1dadb30f969 | |
parent | dcf87a2e357e277d3f3e3661962703b80113d2f8 [diff] | |
parent | a3cabb271ea66739704497102536fb01bb72fe37 [diff] |
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: PATA-mode fixes for sis_sata libata: add HTS541616J9SA00 to NCQ blacklist sata_nv: allow changing queue depth sata_inic162x: disable LBA48 devices libata: remove reading alt_status from ata_hsm_qc_complete() libata: pata_pdc2027x PLL input clock fix scsi disk help file is not complete