mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-19 03:09:59 +00:00

Conflicts: drivers/ata/libata-scsi.c include/linux/libata.h Futher merge of Linus's head and compilation fixups. Signed-Off-By: David Howells <dhowells@redhat.com>