mirror of
https://github.com/torvalds/linux
synced 2024-10-28 06:09:03 +00:00
797b3a9ee7
Both zynq and shmobile have conflicts against the gic cleanup series, resolved here. Conflicts: arch/arm/mach-shmobile/smp-emev2.c arch/arm/mach-shmobile/smp-r8a7779.c arch/arm/mach-shmobile/smp-sh73a0.c arch/arm/mach-zynq/platsmp.c drivers/gpio/gpio-pl061.c Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
common.c | ||
common.h | ||
headsmp.S | ||
hotplug.c | ||
Kconfig | ||
Makefile | ||
Makefile.boot | ||
platsmp.c | ||
slcr.c |