Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 00:10:06 +0000 (19:10 -0500)
committerJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 00:10:06 +0000 (19:10 -0500)
commit75deb6fa985bd3162b9472f1fc394e23294da816
treef959602fae8faba6b6cdc617069f3c02414e453b
parent2061a47a9b9530a9523e51167c996307db951c31
parent6971ed1fbbc80cae54e082aae153d5b063885d0a
Merge branch 'upstream-fixes'
drivers/scsi/ahci.c