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

Simple merge