Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Mon, 27 Feb 2006 16:51:52 +0000 (11:51 -0500)
committerJeff Garzik <jeff@garzik.org>
Mon, 27 Feb 2006 16:51:52 +0000 (11:51 -0500)
1  2 
drivers/scsi/libata-core.c

Simple merge