mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
2cbe23e3a4
Conflicts: arch/arm/mach-tegra/Makefile arch/arm/mach-vexpress/core.h The tegra Makefile was changed in four different branches in the same line. This merge should reduce the amount of churn. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
include/mach | ||
core.c | ||
core.h | ||
hotplug.c | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
platsmp.c | ||
realview_eb.c | ||
realview_pb11mp.c | ||
realview_pb1176.c | ||
realview_pba8.c | ||
realview_pbx.c |