Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Fri, 24 Mar 2006 17:29:39 +0000 (12:29 -0500)
committerJeff Garzik <jeff@garzik.org>
Fri, 24 Mar 2006 17:29:39 +0000 (12:29 -0500)
commit4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99
treec4ff89dc09abe69d58db1e14da22ecda9fdd3ce8
parent84ac69e8bf9f36eb0166817373336d14fa58f5cc
parentaec5c3c1a929d7d79a420e943285cf3ba26a7c0d
Merge branch 'upstream'

Conflicts:

drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
drivers/scsi/sata_vsc.c
include/linux/libata.h