Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 03:54:56 +0000 (23:54 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 03:54:56 +0000 (23:54 -0400)
commit73561695b2e77473e353a5ae63bab81ed5098d8e
treed039affaa54d38985e41566e4d62e0aa6a170287
parent6f2f38128170814e151cfedf79532e19cd179567
parent8be3de3fd8469154a2b3e18a4712032dac5b4a53
Merge ... /spare/repo/linux-2.6/.git branch HEAD
drivers/scsi/libata-core.c
include/linux/libata.h