Merge branch 'upstream-fixes' into upstream
commit3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb
authorJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:36:08 +0000 (20 00:36 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 20 May 2006 04:36:08 +0000 (20 00:36 -0400)
treeaddbc37a278a126a19e03edd8270e577c75a8829
parent8d4ee71ff6de5255ebfdf44fb83419d27bd06368
parente2a7f77a7b4ab298a38c8d1f624628456069bdb0
Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c