Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
author <jgarzik@pretzel.yyz.us> <>
Sat, 4 Jun 2005 04:40:40 +0000 (00:40 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 4 Jun 2005 04:40:40 +0000 (00:40 -0400)
1  2 
drivers/scsi/sata_promise.c

Simple merge