Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
author <jgarzik@pretzel.yyz.us> <>
Tue, 31 May 2005 15:50:32 +0000 (11:50 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 31 May 2005 15:50:32 +0000 (11:50 -0400)
commitedb3e182b6f33c91ba8778e2198220c12712d3ad
tree6b741e144c2c83e901a325e5373dc0b8baf88534
parent8973a585aec125beb2a3de50bb491004299f53d5
parent5e485b7975472ba4a408523deb6541e70c451842
Merge ... /linux/kernel/git/torvalds/linux-2.6.git branch HEAD
drivers/scsi/ahci.c