Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 22:50:08 +0000 (14:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 22:50:08 +0000 (14:50 -0800)
commitabf8792d0e1b203e303ed1c02437e0e10a39dcda
tree8f0a9c4db37c6e776adf98e1a066f8dcb889e22d
parente0e736fc0d33861335e2a132e4f688f7fd380c61
parente14411da420bad7bdaae65cccd8787674e6c565e
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