mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-09 02:51:20 +00:00
944483d033
This resolves a nontrivial conflict against a bug fix in another branch. Conflicts: arch/arm/mach-exynos/pm.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
include/mach | ||
common.h | ||
exynos-smc.S | ||
exynos.c | ||
firmware.c | ||
headsmp.S | ||
hotplug.c | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
mcpm-exynos.c | ||
mfc.h | ||
platsmp.c | ||
pm_domains.c | ||
pm.c | ||
pmu.c | ||
regs-pmu.h | ||
regs-sys.h | ||
sleep.S | ||
smc.h |