eff@garzik.org> 1144774300 -0400
committer Jeff Garzik <jeff@garzik.org> 1144774300 -0400

Merge branch 'master'

Conflicts:

	drivers/scsi/libata-scsi.c
	include/linux/libata.h
Ïkh®Ÿ(x