Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 16:07:14 +0000 (11:07 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 16:07:14 +0000 (11:07 -0500)
1  2 
drivers/scsi/ata_piix.c

Simple merge