| commit | 335fb8fc71692830aca0a5a5fe7f60016ee0d0aa | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Sep 20 13:25:35 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Sep 20 13:25:35 2007 -0700 |
| tree | 909e8c07f953d7d81cc4daebfe937a95966d432b | |
| parent | b8fceee17a310f189188599a8fa5e9beaff57eb0 [diff] | |
| parent | c69c0892d8dd68b01a9fced5cab8527f0698c15e [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] ahci: add ATI SB800 PCI IDs libata-sff: Fix documentation libata: Update the blacklist with a few more devices