9db7372445
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> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
tpm_atmel.c | ||
tpm_atmel.h | ||
tpm_bios.c | ||
tpm_infineon.c | ||
tpm_nsc.c | ||
tpm_tis.c | ||
tpm.c | ||
tpm.h |