56012808f4
Conflicts: arch/arm/Makefile |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
cpu.c | ||
mach-anw6410.c | ||
mach-hmt.c | ||
mach-ncp.c | ||
mach-smdk6410.c | ||
setup-sdhci.c |
56012808f4
Conflicts: arch/arm/Makefile |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
cpu.c | ||
mach-anw6410.c | ||
mach-hmt.c | ||
mach-ncp.c | ||
mach-smdk6410.c | ||
setup-sdhci.c |