| commit | fec69a97489f961026e24536dbb7b86ac663948c | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Sun Jun 11 23:04:37 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Sun Jun 11 23:04:37 2006 -0400 |
| tree | 869713470d81ebc261598489a2711960336c7c37 | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b [diff] | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 [diff] |
Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/sata_sil24.c