Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:59:39 +0000 (19:59 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 30 Mar 2006 00:59:39 +0000 (19:59 -0500)
commit4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2
tree664564736e52a88e14d9c699c5c723b89785f4cb
parent74d89c16735d83349ea74232031819e989a49156
parent55d8ca4f8094246da6e71889a4e04bfafaa78b10
Merge branch 'upstream'

Conflicts:

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