| commit | e42d7be25cf53548347bff8b8f43410704ea7bb0 | [log] [tgz] |
|---|---|---|
| author | Jeff Garzik <jeff@garzik.org> | Sun May 28 16:32:59 2006 -0400 |
| committer | Jeff Garzik <jeff@garzik.org> | Sun May 28 16:32:59 2006 -0400 |
| tree | 7afd08ee70f929abec9118960508828e2d07f234 | |
| parent | 75e995855f45a83afdae34d50c0b3ee14fb23b7a [diff] | |
| parent | 0737ac895afbfbe210557fa5fbafcca932d5fa7c [diff] |
Merge branch 'upstream-fixes' into upstream Conflicts: drivers/scsi/libata-core.c