![]() 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> |
||
---|---|---|
.. | ||
dlmapi.h | ||
dlmast.c | ||
dlmcommon.h | ||
dlmconvert.c | ||
dlmconvert.h | ||
dlmdebug.c | ||
dlmdomain.c | ||
dlmdomain.h | ||
dlmfs.c | ||
dlmfsver.c | ||
dlmfsver.h | ||
dlmlock.c | ||
dlmmaster.c | ||
dlmrecovery.c | ||
dlmthread.c | ||
dlmunlock.c | ||
dlmver.c | ||
dlmver.h | ||
Makefile | ||
userdlm.c | ||
userdlm.h |