mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-31 22:15:38 +00:00
009f742bde
Merge branch 'next-s3c64xx-updates' into for-rmk Conflicts: arch/arm/plat-s3c/dev-hsmmc2.c arch/arm/plat-s3c/include/plat/sdhci.h |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
mach-smdk6400.c | ||
Makefile | ||
Makefile.boot | ||
s3c6400.c | ||
setup-sdhci.c |