45c8fa8784
Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
cpu.c | ||
dev-audio.c | ||
dev-spi.c | ||
dma.c | ||
gpio.c | ||
init.c | ||
Kconfig | ||
mach-smdk6440.c | ||
Makefile | ||
Makefile.boot | ||
setup-i2c0.c |