Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Fri, 3 Mar 2006 17:16:03 +0000 (12:16 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 3 Mar 2006 17:16:03 +0000 (12:16 -0500)
1  2 
drivers/scsi/libata-core.c

Simple merge