Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 05:49:12 +0000 (01:49 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 05:49:12 +0000 (01:49 -0400)
commitc81e29b4aca2b2503238276219d97faaac994b4f
tree02ec800bd9e2625b89757e2ba59f3b3c0f7c1236
parentd3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5
parentbb31a8faa270beafcc51a65880c5564c6b718bd6
Merge branch 'upstream-fixes' into upstream

Conflicts:

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