mirror of
https://github.com/torvalds/linux.git
synced 2024-10-23 21:50:43 +00:00
a07613a54d
Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
clock.c | ||
irq.c | ||
Kconfig | ||
mach-smdk2416.c | ||
Makefile | ||
pm.c | ||
s3c2416.c | ||
setup-sdhci-gpio.c |