mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
421b759b86
Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
devices | ||
include/mach | ||
3ds_debugboard.c | ||
audmux-v1.c | ||
audmux-v2.c | ||
avic.c | ||
clock.c | ||
cpu.c | ||
cpufreq.c | ||
devices.c | ||
epit.c | ||
iomux-v1.c | ||
iomux-v3.c | ||
iram_alloc.c | ||
irq-common.c | ||
irq-common.h | ||
Kconfig | ||
Makefile | ||
pwm.c | ||
ssi-fiq-ksym.c | ||
ssi-fiq.S | ||
system.c | ||
time.c | ||
tzic.c | ||
ulpi.c |