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)
1  2 
drivers/scsi/ahci.c

Simple merge