Merge of 'new-ids' branch from

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev