404a02cbd2
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h |
||
---|---|---|
.. | ||
clock.c | ||
crm_regs.h | ||
devices.c | ||
devices.h | ||
iomux.c | ||
Kconfig | ||
magx-zn5.c | ||
Makefile | ||
Makefile.boot | ||
mm.c | ||
system.c |
404a02cbd2
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h |
||
---|---|---|
.. | ||
clock.c | ||
crm_regs.h | ||
devices.c | ||
devices.h | ||
iomux.c | ||
Kconfig | ||
magx-zn5.c | ||
Makefile | ||
Makefile.boot | ||
mm.c | ||
system.c |