Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Wed, 1 Mar 2006 19:45:47 +0000 (14:45 -0500)
committerJeff Garzik <jeff@garzik.org>
Wed, 1 Mar 2006 19:45:47 +0000 (14:45 -0500)
commitd2dbaad8555b9a078830ac1aab7ef7a37461c640
tree6d455666df51db6a24834e6551e246e0c0d0d078
parentcccc65a3b60edaf721cdee5a14f68ba009341822
parent71efa38c0eef581c69c221ceb8645f61d1e93270
Merge branch 'master'
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
drivers/scsi/libata.h
drivers/scsi/scsi_error.c