Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
---|---|---|
.. | ||
Makefile | ||
adma.c | ||
cp6.c | ||
gpio.c | ||
i2c.c | ||
pci.c | ||
pmu.c | ||
restart.c | ||
setup.c | ||
time.c |
Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
---|---|---|
.. | ||
Makefile | ||
adma.c | ||
cp6.c | ||
gpio.c | ||
i2c.c | ||
pci.c | ||
pmu.c | ||
restart.c | ||
setup.c | ||
time.c |