tree 869713470d81ebc261598489a2711960336c7c37
parent 1049cb478783c74ca8c99ef70e7d2bf920b9335b
parent 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320
author Jeff Garzik <jeff@garzik.org> 1150081477 -0400
committer Jeff Garzik <jeff@garzik.org> 1150081477 -0400

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/sata_sil24.c