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/plat | ||
| Kconfig | ||
| Makefile | ||
| adc.c | ||
| clock-clksrc.c | ||
| clock.c | ||
| dev-adc.c | ||
| dev-fb.c | ||
| dev-hsmmc.c | ||
| dev-hsmmc1.c | ||
| dev-hsmmc2.c | ||
| dev-hwmon.c | ||
| dev-i2c0.c | ||
| dev-i2c1.c | ||
| dev-nand.c | ||
| dev-rtc.c | ||
| dev-uart.c | ||
| dev-usb-hsotg.c | ||
| dev-usb.c | ||
| dma.c | ||
| gpio-config.c | ||
| gpio.c | ||
| gpiolib.c | ||
| init.c | ||
| irq-uart.c | ||
| irq-vic-timer.c | ||
| pm-check.c | ||
| pm-gpio.c | ||
| pm.c | ||
| pwm-clock.c | ||
| pwm.c | ||
| s3c-pl330.c | ||
| time.c | ||