tree f869fb02ad1ca49e0920e073b22cbb96a184ccae
parent 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110
parent 1ad8e7f9eb051b040880e45337ed74bfd916ef7f
author Jeff Garzik <jeff@garzik.org> 1143988240 -0400
committer Jeff Garzik <jeff@garzik.org> 1143988240 -0400

Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/pdc_adma.c
	drivers/scsi/sata_mv.c
	drivers/scsi/sata_nv.c
	drivers/scsi/sata_promise.c
	drivers/scsi/sata_qstor.c
	drivers/scsi/sata_sx4.c
	drivers/scsi/sata_vsc.c
	include/linux/libata.h