Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Sun, 29 Jan 2006 07:47:18 +0000 (02:47 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 29 Jan 2006 07:47:18 +0000 (02:47 -0500)
commitb1d917739acd44e14eb13813e4c94dc4b6831ca3
treed666684748522c31356d04f8243f6bcd7203dc8b
parentc893a3ae49279a4ab6aa6cf594a2ec6d286e1187
parentbd12097c7415c13aff53aed473eec92acd15712a
Merge branch 'upstream-fixes'
drivers/scsi/ahci.c