7f0ff702cd
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung Conflicts: arch/arm/mach-s3c64xx/Makefile (fixed) |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| clock.c | ||
| dma.c | ||
| irq.c | ||
| mach-smdk2443.c | ||
| s3c2443.c | ||