bde755679a
Conflicts: arch/arm/mach-exynos/clock-exynos4.c arch/arm/mach-exynos/clock.c The cleanup moves the exynos4 clock implementation away, while the other branch modifies the file with the old name. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
clock.c | ||
dev-mfc.c | ||
dev-uart.c | ||
irq-eint.c | ||
irq-gpioint.c | ||
irq-pm.c | ||
irq.c | ||
Kconfig | ||
Makefile | ||
pm.c | ||
s5p-time.c | ||
setup-mipiphy.c | ||
sleep.S | ||
sysmmu.c |