bcb8a0d6f5
Merge branch 'next-s3c64xx-dma2' into for-rmk-devel Conflicts: arch/arm/plat-s3c64xx/Makefile |
||
|---|---|---|
| .. | ||
| common-smdk.h | ||
| dma-plat.h | ||
| irq.h | ||
| map.h | ||
| mci.h | ||
| pll.h | ||
| pm-core.h | ||
| regs-dma.h | ||
| regs-iis.h | ||
| regs-spi.h | ||
| regs-udc.h | ||
| s3c2400.h | ||
| s3c2410.h | ||
| s3c2412.h | ||
| s3c2440.h | ||
| s3c2442.h | ||
| s3c2443.h | ||
| udc.h | ||