Tiny merge resolutions along the way to 5.8-rc1. Change-Id: I0036e22af4e398b0bb3b9855ff90d60b9c0227ee Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> |
||
|---|---|---|
| .. | ||
| card.h | ||
| core.h | ||
| host.h | ||
| mmc.h | ||
| pm.h | ||
| sd.h | ||
| sdhci-pci-data.h | ||
| sdio.h | ||
| sdio_func.h | ||
| sdio_ids.h | ||
| sh_mmcif.h | ||
| slot-gpio.h | ||