Merge branch 'max-sect' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 15 May 2006 15:27:47 +0000 (11:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 15 May 2006 15:27:47 +0000 (11:27 -0400)
commit8d4ee71ff6de5255ebfdf44fb83419d27bd06368
treeae03881d6d86b528e075f7b6af8af74f4dbbf9ec
parentefa6e7e9d40fe01406d889a5bed62f2e0da49bff
parent9a375e93f88269bb770fb2eaa57554c975449c88
Merge branch 'max-sect' into upstream
drivers/scsi/libata-scsi.c
include/linux/libata.h