bcb8a0d6f5
Merge branch 'next-s3c64xx-dma2' into for-rmk-devel Conflicts: arch/arm/plat-s3c64xx/Makefile |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
mach-smdk6400.c | ||
Makefile | ||
Makefile.boot | ||
s3c6400.c | ||
setup-sdhci.c |
bcb8a0d6f5
Merge branch 'next-s3c64xx-dma2' into for-rmk-devel Conflicts: arch/arm/plat-s3c64xx/Makefile |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
mach-smdk6400.c | ||
Makefile | ||
Makefile.boot | ||
s3c6400.c | ||
setup-sdhci.c |