Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 00:21:17 +0000 (19:21 -0500)
committerJeff Garzik <jeff@garzik.org>
Sun, 12 Mar 2006 00:21:17 +0000 (19:21 -0500)
commitce1e7a2ac721eb9d825b63f74752d0c9e0c635c2
treea7c0d18d6486734dffb9498e30db5b226b6e23bf
parentc2956a3b0d1c17b38da369811a6ce93eb7a01a04
parent75deb6fa985bd3162b9472f1fc394e23294da816
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_promise.c
include/linux/libata.h