tree e786da7145d83c19a594adf76ed90d52c51058b1
parent d7a80dad2fe19a2b8c119c8e9cba605474a75a2b
parent d588fcbe5a7ba8bba2cebf7799ab2d573717a806
author Jeff Garzik <jeff@garzik.org> 1151028716 -0400
committer Jeff Garzik <jeff@garzik.org> 1151028716 -0400

Merge branch 'master' into upstream

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/libata-scsi.c
	include/linux/pci_ids.h