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)
1  2 
drivers/scsi/ahci.c

Simple merge