From: Thomas Petazzoni Date: Thu, 22 Nov 2012 09:55:09 +0000 (+0100) Subject: Merge tag 'marvell-armadaxp-smp-for-3.8' of github.com:MISL-EBU-System-SW/mainline... X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~12^2~1^2^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1112b36094e48f89ce7dca5aee90b05c30162da9;p=pandora-kernel.git Merge tag 'marvell-armadaxp-smp-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into mevbu-dt-additions SMP support for Armada XP The purpose of this series is to add the SMP support for the Armada XP SoCs. Beside the SMP support itself brought by the last 3 commits, this series also adds the support for the coherency fabric unit and the power management service unit. The coherency fabric is responsible for ensuring hardware coherency between all CPUs and between CPUs and I/O masters. This unit is also available for Armada 370 and will be used in an incoming patch set for hardware I/O cache coherency. The power management service unit is responsible for powering down and waking up CPUs and other SOC units. Conflicts: arch/arm/mach-mvebu/armada-370-xp.c --- 1112b36094e48f89ce7dca5aee90b05c30162da9 Reading git-diff-tree failed