Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:24:55 +0000 (17:24 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:24:55 +0000 (17:24 -0500)
1  2 
drivers/scsi/libata-core.c

Simple merge