7f0ff702cd
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung Conflicts: arch/arm/mach-s3c64xx/Makefile (fixed) |
||
---|---|---|
.. | ||
include/mach | ||
Kconfig | ||
Makefile | ||
clock.c | ||
dma.c | ||
dsc.c | ||
irq.c | ||
mach-anubis.c | ||
mach-at2440evb.c | ||
mach-gta02.c | ||
mach-mini2440.c | ||
mach-nexcoder.c | ||
mach-osiris-dvs.c | ||
mach-osiris.c | ||
mach-rx3715.c | ||
mach-smdk2440.c | ||
s3c244x-clock.c | ||
s3c244x-irq.c | ||
s3c244x.c | ||
s3c2440.c | ||
s3c2442.c |