mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
![]() 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> |
||
---|---|---|
.. | ||
debug-macro.S | ||
dma.h | ||
entry-macro.S | ||
gpio.h | ||
hardware.h | ||
i2c.h | ||
io.h | ||
irqs.h | ||
map.h | ||
pm-core.h | ||
regs-clock.h | ||
regs-gpio.h | ||
regs-irq.h | ||
s5p64x0-clock.h | ||
spi-clocks.h | ||
system.h | ||
tick.h | ||
timex.h | ||
uncompress.h |