Merge branch 'tmp'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:39:25 +0000 (02:39 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:39:25 +0000 (02:39 -0500)
commit7103c7bc863c10dd2a26c19c8cf4d7d2846da947
tree73a9d674670c37e4f160c0d4553f3d14664900be
parentb4d28889f7ebfe498dedaceb773b4c785b97d195
parenta72ec4ce6d3ae92e76baf5b2c65cc26e5e775e83
Merge branch 'tmp'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_sx4.c
include/linux/libata.h