Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Sun, 24 Sep 2006 05:52:47 +0000 (01:52 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 24 Sep 2006 05:52:47 +0000 (01:52 -0400)
commit23930fa1cebfea6f79881c588ccd1b0781e49e3f
tree36d29e3f83661c4f5f45b6f74ac0d5f9886867a8
parent36b35a5be0e4b406acd816e2122d153e875105be
parent4f5537de7c1531398e84e18a24f667e49cc94208
Merge branch 'master' into upstream
drivers/ata/libata-eh.c
drivers/ata/sata_svw.c
drivers/scsi/Kconfig
drivers/scsi/Makefile