Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Sun, 28 May 2006 20:32:59 +0000 (16:32 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 28 May 2006 20:32:59 +0000 (16:32 -0400)
commite42d7be25cf53548347bff8b8f43410704ea7bb0
tree7afd08ee70f929abec9118960508828e2d07f234
parent75e995855f45a83afdae34d50c0b3ee14fb23b7a
parent0737ac895afbfbe210557fa5fbafcca932d5fa7c
Merge branch 'upstream-fixes' into upstream

Conflicts:

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