| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Thu Jun 22 22:11:56 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Thu Jun 22 22:11:56 2006 -0400 |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b [diff] | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 [diff] |
Merge branch 'master' into upstream Conflicts: drivers/scsi/libata-core.c drivers/scsi/libata-scsi.c include/linux/pci_ids.h