| commit | 5e88083f40b38a5382f590475be4607f7cdb30df | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 13 19:07:15 2012 +0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 13 19:07:15 2012 +0800 |
| tree | 05a5a203c93bc84e71309b1fc91ec15693a9cd93 | |
| parent | bc01637a80f5b670bd70a0279d3f93fa8de1c96d [diff] | |
| parent | 7b4f6ecacb14f384adc1a5a67ad95eb082c02bd1 [diff] |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev Pull additional AHCI PCI IDs from Jeff Garzik. * tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: Add identifiers for ASM106x devices ahci: Add alternate identifier for the 88SE9172 ahci: Add JMicron 362 device IDs