| commit | 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb | |
| author | Jeff Garzik <jeff@garzik.org> | |
| Sat, 20 May 2006 04:36:08 +0000 (20 00:36 -0400) | ||
| committer | Jeff Garzik <jeff@garzik.org> | |
| Sat, 20 May 2006 04:36:08 +0000 (20 00:36 -0400) | ||
| tree | addbc37a278a126a19e03edd8270e577c75a8829 | treesnapshot (tar.gz zip) |
| parent | 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 | commitdiff |
| parent | e2a7f77a7b4ab298a38c8d1f624628456069bdb0 | commitdiff |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
Conflicts:
drivers/scsi/libata-core.c
| drivers/scsi/libata-core.c | diff1 | diff2 | blobhistory |
| drivers/scsi/sata_mv.c | diff1 | diff2 | blobhistory |