f9cef50681
Conflicts: arch/arm/mach-s3c64xx/dev-audio.c |
||
---|---|---|
.. | ||
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-hsmmc3.c | ||
dev-hwmon.c | ||
dev-i2c0.c | ||
dev-i2c1.c | ||
dev-i2c2.c | ||
dev-i2c3.c | ||
dev-i2c4.c | ||
dev-i2c5.c | ||
dev-i2c6.c | ||
dev-i2c7.c | ||
dev-ide.c | ||
dev-keypad.c | ||
dev-nand.c | ||
dev-onenand.c | ||
dev-rtc.c | ||
dev-ts.c | ||
dev-uart.c | ||
dev-usb-hsotg.c | ||
dev-usb.c | ||
dev-wdt.c | ||
dma.c | ||
gpio-config.c | ||
gpio.c | ||
gpiolib.c | ||
init.c | ||
irq-uart.c | ||
irq-vic-timer.c | ||
platformdata.c | ||
pm-check.c | ||
pm-gpio.c | ||
pm.c | ||
pwm-clock.c | ||
pwm.c | ||
s3c-pl330.c | ||
time.c | ||
wakeup-mask.c |