| commit | c81e29b4aca2b2503238276219d97faaac994b4f | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Wed May 24 01:49:12 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Wed May 24 01:49:12 2006 -0400 |
| tree | 02ec800bd9e2625b89757e2ba59f3b3c0f7c1236 | |
| parent | d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 [diff] | |
| parent | bb31a8faa270beafcc51a65880c5564c6b718bd6 [diff] |
Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c