tree 8f0a9c4db37c6e776adf98e1a066f8dcb889e22d
parent e0e736fc0d33861335e2a132e4f688f7fd380c61
parent e14411da420bad7bdaae65cccd8787674e6c565e
author Linus Torvalds <torvalds@linux-foundation.org> 1294699808 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294699808 -0800

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