f9cef50681
Conflicts: arch/arm/mach-s3c64xx/dev-audio.c |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
clock.c | ||
cpu.c | ||
dev-audio.c | ||
dev-spi.c | ||
dma.c | ||
gpiolib.c | ||
init.c | ||
mach-smdkc100.c | ||
setup-fb-24bpp.c | ||
setup-i2c0.c | ||
setup-i2c1.c | ||
setup-ide.c | ||
setup-keypad.c | ||
setup-sdhci-gpio.c | ||
setup-sdhci.c |