Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:59:55 +0000 (23:59 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:59:55 +0000 (23:59 -0400)
commitc256e95f7d602737e380f5f08666cc6a74023b4a
tree70d2111d62face3dbecd61885d61c86d3f81c7cb
parent38ebb1e0ed214efe124534eba4a34e869a0d8da7
parentc71d6be54e92c4b2d31faf51850354aff22b82b0
Merge branch 'upstream-fixes' into upstream
drivers/scsi/libata-core.c