c19efab886
Conflicts: drivers/mci/mci-core.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ahci.c | ||
ahci.h | ||
disk_ata_drive.c | ||
disk_bios_drive.c | ||
ide-sff.c | ||
intf_platform_ide.c | ||
pata-imx.c | ||
sata-imx.c |
c19efab886
Conflicts: drivers/mci/mci-core.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
ahci.c | ||
ahci.h | ||
disk_ata_drive.c | ||
disk_bios_drive.c | ||
ide-sff.c | ||
intf_platform_ide.c | ||
pata-imx.c | ||
sata-imx.c |