05e3475451
Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S |
||
---|---|---|
.. | ||
include/plat | ||
Kconfig | ||
Makefile | ||
clock.c | ||
padmux.c | ||
shirq.c | ||
time.c |
05e3475451
Conflicts: arch/arm/kernel/module.c arch/arm/mach-s5pv210/sleep.S |
||
---|---|---|
.. | ||
include/plat | ||
Kconfig | ||
Makefile | ||
clock.c | ||
padmux.c | ||
shirq.c | ||
time.c |