K 10 svn:author V 6 marius K 8 svn:date V 27 2017-08-02T20:27:30.695374Z K 7 svn:log V 262 Apply the other half of merges to sdhci_imx(4) and sdhci_fsl(4) that somehow stayed local when committing r318198, probably due to the associated tree conflicts. While at it, register the dependency of sdhci_fsl(4) on sdhci(4) and allow the former to be built. END