mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +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>