Skip to content
Snippets Groups Projects
user avatar
David Howells authored
Conflicts:

	drivers/ata/libata-scsi.c
	include/linux/libata.h

Futher merge of Linus's head and compilation fixups.

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
9db73724
History