f18ea8276b
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk Conflicts: arch/arm/mach-s3c2440/mach-anubis.c |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
clock.c | ||
dma.c | ||
dsc.c | ||
irq.c | ||
mach-anubis.c | ||
mach-at2440evb.c | ||
mach-mini2440.c | ||
mach-nexcoder.c | ||
mach-osiris-dvs.c | ||
mach-osiris.c | ||
mach-rx3715.c | ||
mach-smdk2440.c | ||
s3c2440.c |