mirror of https://gitee.com/openkylin/linux.git
11c7a6c5a3
The realview multiplatform series has a trivial conflict with one of the treewide cleanups, let's just merge that in to avoid having to resolve this later. * treewide/cleanup: ARM: use "depends on" for SoC configs instead of "if" after prompt ARM/clocksource: use automatic DT probing for ux500 PRCMU ARM: use const and __initconst for smp_operations ARM: hisi: do not export smp_operations structures Conflicts: arch/arm/mach-integrator/Kconfig |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
cm.h | ||
common.h | ||
core.c | ||
hardware.h | ||
impd1.c | ||
impd1.h | ||
integrator_ap.c | ||
integrator_cp.c | ||
lm.c | ||
lm.h | ||
pci_v3.c | ||
pci_v3.h |