Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:20:42 +0000 (02:20 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:20:42 +0000 (02:20 -0500)
commit2af5920b81a4cd0a22d40b6b2c38356d3df03e13
tree7ee66d514e394f70f12a608548487353d506215d
parent000080c3499cd5037e60c08a8053efb9e48aa9c0
parent3ee68c4af3fd7228c1be63254b9f884614f9ebb2
Merge branch 'master'
drivers/scsi/libata-core.c
include/linux/libata.h