Merge branch 'tmp'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:26:46 +0000 (02:26 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 27 Jan 2006 07:26:46 +0000 (02:26 -0500)
commit8dd2e3bd57c3b389febba1de6b10372ef507f985
tree1fdb120ec9c0c81f8f2a9452ae6c225d68aed5e3
parent2af5920b81a4cd0a22d40b6b2c38356d3df03e13
parent71e834f563799e09c6bd7d6638993b464fac26f5
Merge branch 'tmp'
drivers/scsi/libata-core.c
include/linux/ata.h
include/linux/libata.h