84eb9ecce2
Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
cpu.c | ||
dev-audio.c | ||
gpiolib.c | ||
init.c | ||
irq-gpio.c | ||
Kconfig | ||
mach-smdkc100.c | ||
Makefile | ||
Makefile.boot | ||
setup-fb-24bpp.c | ||
setup-i2c0.c | ||
setup-i2c1.c | ||
setup-sdhci-gpio.c | ||
setup-sdhci.c |