Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 29 Oct 2005 01:32:01 +0000 (21:32 -0400)
commit5615ca7906aefbdc3318604c89db5931d0a25910
treec34bcc7e314f49005ad88ac84c908128729c0329
parent7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6
parent9dfb7808fb05643b0d06df7411b94d9546696bf1
Merge branch 'upstream'
drivers/scsi/libata-scsi.c
drivers/scsi/pdc_adma.c