Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 15:38:12 +0000 (11:38 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 15:38:12 +0000 (11:38 -0400)
1  2 
drivers/scsi/libata-core.c

Simple merge