Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 19:29:12 +0000 (14:29 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 1 Apr 2006 19:29:12 +0000 (14:29 -0500)
commit6e07e16404deafadf45895a7d2aeb5feba53b479
treea7025d6632f0b3eb6232eafba79f331ead812fcf
parent08a556db919f67e1e4d33ae8d40f7222da34d994
parente8e0619f68bff8f39d98c46aac85ed1d4557ccfd
Merge branch 'upstream'
drivers/scsi/libata-core.c
drivers/scsi/sata_mv.c
include/linux/libata.h