f66e14b578139bba2c75fb3f9a
author Jeff Garzik <jeff@garzik.org> 1143210244 -0500
committer Jeff Garzik <jeff@garzik.org> 1143210244 -0500

Merge branch 'upstream'

Conflicts:

	drivers/scsi/sata_vsc.c
 ¹_Å–