Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:31:34 +0000 (12:31 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:31:34 +0000 (12:31 -0400)
commit96b88fb850cc419171f926ad04650ec509e9f543
tree5bf9537bde467534608b3acdbfa5f7726ede8c3f
parente78a57de94480226f7fc90d0b4837bfc6c99a9e0
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e
Merge branch 'master'
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h