Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:29 +0000 (12:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:30:29 +0000 (12:30 -0400)
commit35ebbae2836a361330b784706b7140c90a346a53
treeada3c046a8b6bfdf21bcb0932b4b65c95c2af073
parentc6a33e2464edd87f8c12cc2d11369a5b44c65b77
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e
Merge branch 'master'
drivers/scsi/libata-scsi.c
include/linux/ata.h