Merge of 'misc-fixes' branch from

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