14b8a0f92b
Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2 Conflicts: arch/arm/mach-s3c64xx/include/mach/map.h arch/arm/plat-samsung/Kconfig arch/arm/plat-samsung/Makefile |
||
|---|---|---|
| .. | ||
| include/mach | ||
| Kconfig | ||
| Makefile | ||
| Makefile.boot | ||
| clock.c | ||
| cpu.c | ||
| cpufreq.c | ||
| dev-audio.c | ||
| dev-spi.c | ||
| dev-uart.c | ||
| dma.c | ||
| gpiolib.c | ||
| irq-eint.c | ||
| irq-pm.c | ||
| irq.c | ||
| mach-anw6410.c | ||
| mach-hmt.c | ||
| mach-ncp.c | ||
| mach-smdk6400.c | ||
| mach-smdk6410.c | ||
| pm.c | ||
| s3c6400.c | ||
| s3c6410.c | ||
| setup-fb-24bpp.c | ||
| setup-i2c0.c | ||
| setup-i2c1.c | ||
| setup-sdhci-gpio.c | ||
| setup-sdhci.c | ||
| sleep.S | ||