From: Linus Torvalds Date: Mon, 10 Jan 2011 22:50:08 +0000 (-0800) Subject: Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm X-Git-Tag: firefly_0821_release~7613^2~3074 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=abf8792d0e1b203e303ed1c02437e0e10a39dcda;p=firefly-linux-kernel-4.4.55.git Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm * 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm: msm: add SMP support for msm msm: hotplug: support cpu hotplug on msm msm: timer: SMP timer support for msm msm: scm-boot: Support for setting cold/warm boot addresses msm: Secure Channel Manager (SCM) support --- abf8792d0e1b203e303ed1c02437e0e10a39dcda